Fixed some bugs in the Calculator