Working navigation
Some cleanup and comments