Bug fix and add all comparison operators