routes and models fixes