consistency for carriage returns!
untested fix to location type ordering issue
make routes a bit faster