Routes fixes and some refactoring.