- added CurrentRoute to Controller
- cleanups