Some major fixes and improvements to the navigation / routing system