Calculator Fixes

Fixed issues pertaining to the calculator; also including some
uncommitted modifications to geometryDrawing