fix #730 and fix #724 by bringing in @usetheimpe's changes
Merge pull request #759 from waterbearlang/730_code_map_navigation

fix #730 and fix #724 by bringing in @usetheimpe's changes