map: better user feedback
Merge branch 'new-map' into next