Timeouts with tests, more comments, proxy settings with validation.