Changing out parsing for new dataset and fixing errors