Incorporate most review comments.

Nearly all review comments are done. Except for the first line of the
introduction.