More worldgen tweaks