change default timeout to 600 seconds; fix some error msg