rename and cleanup
Merge branches 'wip_set_route' and 'master'