Improved logging, reporting.