Add more reporting to fix #13.