Bug fix

The calculator didn't evaluate expressions in the proper order. I think
I've fixed it