Update documentation. Improve timeout behavior