wip
Improved reporting functions