More world generation updates