work on Calculator.evaluate

updating storage element access and exceptions