Fixed max_effort & more output to csv