combined timeout values
corrected check
added cert