Made some changes to the data and queries, updated provided files