Good suggestions :smile: 

Timeouts added with 03b3d6b, retries added with 2ddca2b