Added some more report generation stuff.