Fix minor breakage to retry logic from refactor

If limit is not set we keep going until we succeed.
Add a --delay option so we don't hammer things to quickly