Improvements to route calc