Improved logging and reporting