fix suggested by, but different than that provided by, Bill Sommerfeld.
headers, and a few other insignificant changes.