635 improve save fmt

Will probably do more on this branch, but want to pull in the current state.