Some report generator improvements