Removed Calc.toZero(), rewrote Calc.correct()