handle finished and retries
fix broken steps