Don't save for each modification.
Call finish handler for Aborted jobs as well.