added/fixed Comparable