Big updates to worldgen