Added CSVs and fixed up extraction scripts