Update to navigation, fixes for various issues