fix for binops
fixed modulation / binop system. phew. changed tests to use binops