Updates for map
Fixes for worlds