nav improvements
small improvents
Merge pull request #20 from patriot1burke/master

improvements