Map, tweaks, etc

recommiting after positive server vote