saving new content no longer keeps the new content in unsaved changes

Also consolidates where the original content is squirreled away (for the diff)