general clean up and formatting; removed gt api import; returning y position together with x and y in nav upgrade
14 files changed