More efforts towards spawns, some maps work correctly now