some tweaks to worldgen
Simple merge.