Minor edits to Calculators