Reorganized merging sets and getting feature and activity names in.