fixing routes and such