Some tweaks

See the individual commits.
"Please use the mailing lists and avoid directly emailing individual maintainers. The mailing lists are checked regularly and are the best way to get a response and have answers publicly available for reference."