A few general game tweaks, and a map change