Several Navigational Enhancements, some minor bugs fixed