Sync work done so far
Fix maxRetries and Timeout, remove some work-arounds