Fixed a few bugs in the navigation, and got rid of spare logs.