update retry interval to support agenda
minor fix
merge conflicts