Merge pull request #423 from BarAgent/docs

A couple of doc updates.