ComparatorSet functional, minor fixes. High score!