General routing fixes, bug fixes, better flow overall