calculator prigress
bug fix to calc