did some more data cleaning and munging for next submission