More worldgen tweaks - moving out of COFH because it wasn't workin'