Normalize and extend wording of headers. Some comments added.