fixed some issues with routes, not tested