fixed routes and a fex bugs