large refactoring...
various improvements
better route names