Incorporates today's edit by JED

A detailed edit up to section 4.2