decoupled StillHaveTimeToWork

other bits of cleanup too