Atomic save normalization

Resolves #175

Testing/feedback appreciated.