CHANGES: reword the headers, and perform some minor cleanup.