Part of report for part 2 and some minor fixes.