Fixing up Diff and Subset

Diff and Subset still aren't working, but diff seems like it should work. Or my test isn't right, but it worked in data1.