Add comparators. Additional minor changes