Optimized debugging and retry.
Add wait and retry events.