Change to WorldGen and other minor changes