Add more reporting functions.
Merge conflicts