Added transfer of routes and other bug fixes