Expanded dataGen, added moreData.js