Final map fixes, should be good to go now.
Merge pull request #62 from Glloyd/Glloydmap

Final map fixes, should be good to go now.