Big map improvements
Merge remote-tracking branch 'origin/master'
swoop swoop