better reporting and tweaks