backed out changes to save operation, fixed up actions