Make the timeout more reasonable
Remove debugging, recognize timeout errors