A lot of fixes/improvements for navigation.