Changed names, added Ryan's updates, and changed to mapGen