Added some parsing changes to handle awful excel csv exporting