Rework world.
Small fix in Entity system and Map.