Added an autosave. Bit of cleanup.