more cleanup, add connect timeout override which is needed if we want to handle our own reconnects, which we're now doing