Comments
Longer timeout
Improved logging