Add some comparisons methods, fix the existing checks