Improvements to the first two sections of Part 2.