fixed bad routes & others