Improvements to routing and navigation