Fix routes, small interior changes