remove numpy, fixed operators to match longer one first