Fix data files, part 2 complete