Only call "done" if we didn't fail
remove commented-out code
should be 'fail.failed'
rename fail.failed to fail.aborted (it's clearer)