fmt step_wait, interruptible_wait
Replace all Fatal calls with Error calls
Add error handling to step_wait