add some missing operators, simplify