Do some cleanup and make changes according to previous code review
Merge branch 'with-menu-waypoint' of https://github.com/wsheppard/ecd2012 into josh-emu
Bugfix