legend & minor mods
Merge pull request #1 from amtamayo/map_work

legend & minor mods