add/edit data subsets; various other fixes