Added missing dependency on 'timeout', fixed comments on retry_x