Calculator can do basic arithmetic, some minor bug fixes