Messing with worldgen + a couple of bug fixes