more bug fixes for navigation