Changes from mcote's review of section 8.