Finished general edit by TMG

General comments to be discussed elsewhere.