Add all of the routes and fix some little bugs