More routes and fixes