Changes to new mechanics
Server map events corrections