Increased timeout and slightly improved formatting.