first pass at docs
merging default timeout, adding comment