Fixed routes and added new routes