Full functionality for the calculator, plus at least one bugfix from the last commit