add complete / fail events
add re-attempts
Merge branch 'dev'