fixed the damn calculator.
fixing calc merge conflicts