nav bug fixes
Merge pull request #12 from wraith228/nav_bugfix

nav bug fixes