fixed various bugs in these 4 files, now no self matches... only use this set for createSubmission