new map improvements
new map - z-oder; disabled dummy error message
new map improvements
Merge branch 'new-map' into next