updates to calc functionality