Improved world generation