small changes and a testcage for navigation
Merge branch 'master' of https://github.com/samli177/S.M.A.U.G