Few improvements while adding diagrams to the report.