code cleanup and some tweaks to the map display
code cleanup and some tweaks to the map display