Increased retries in client:start to 100, minor edits?