map improvements
Merge branch 'new-map' into next