added initial timeout code to client.
clarified comments.