Rename the modulo operator
Correct two bugs in the circuit library