A bunch of the easy fixes
Fixes to MapAdapter
WIP
Merge pull request #339 from untitaker/sprint-branch

My stuff