improving calculator
bug fix