Fixed up routes and stuff