More adjustments and improvements to mapgen system.