Removed unnecessary base class for set checkers
Several minor fixes