More WorldGen stuff. Addresses #21 and #124