more work on autosaving :)