More patches and tweaks.
Trying to fix more world-generation things.