More documentation and use the timeout setting rather than it being hardcoded