Minor cleanup
Raise default timeout value
Updating docs