refactor(cb): all callback renamed to cb, and local callbacks to _cb
feat(resend): Re-send process improvements