Fixed issue: tappedEquals now creates new calc
Minor changes