Improving timeout behavior and documentation

See #392