Minor changes to Calculator.circ