More updates to the calculator--fixed more bugs