Fixed some bugs and changed a route