removed code that allowed a route return to start, and fixed bugs
Merge branch 'develop'