Overhaul Chapter 3 and two typos in CMA06-1