Some more routes and attempt at bug fix.