renamed XOr to One and removed traces of old ^ verison of operator
various changes; see change log