map improvements
Merge branch 'master' of https://github.com/Aman82/Pocketeers into ben