Route and map integration and improvements