added some timeout/retry options