cleaned up stuff, working on combining two csv files