part 2 report: some fixes