- many improvements to route mapper