Small updates to the router
Merged conflicts from Heroku deploymenet