Adjust some internal timings. Timeout now plays nice with the buffering option.