back route fixes and cleaning up