renamed all predicates and collections outside of zip, changed corner cases of mchopf