changed routes, fixed controllers