little more cleanup and the very very start of adding maps
Merge pull request #2 from bczulauf/ben-maps

little more cleanup and the very very start of adding maps