Tiny calc fixes. Restoring saved calculation added