Added several new calculators