Clean-up.
Merged with Henry's latest changes.
Section 2.1 done.