added full operator support, cleared redundant comments