more progress on Comparable support