Things aren't adding up in the calculator - any feedback appreciated