Map size

Update the map size calculation to be smaller with a higher amount of players. Also merge a previous commit of @lutangar in develop