autosave & minor fixes