Documentation fixes based on mail from Edward Welbourne, and an