make routes more granular by moving away from map routing
fix a 'bug' with a character being used as a leading zero
add more unit tests