updated routes and other fixes
more stuff
even more stuff
more fixes and tweaks