Autosave + correct close