Add timeout
Check for report and output file
Improve counts