updated calculators without bugs