Fix error in control points example and assorted typos, second attempt

This is a resubmission of #3.