Add (==<) and (>==) and minor bug fixes