improved report-generator
merged