sprint-4 minor fixes

Note: Jerome, please fix the route markers lol. They don't clear up properly. Thanks :D