One doc fix, one minor feature, one minor bug fix.

Let me know if these attachments are a problem, and I can send the
text of the patches individually.