improved reporting and logging