fixes from testing all operators