Refine autosave behavior

autosave work, synched up to data-axle/master