Increased timeout and updated logging