Fix routes and ports and stuff
Fix merge conflicts