made makeSingleComb not rely on compare and got rid of swapmn and cleaned up some of the related code/lemmas (relying entirely on jacques' proof now