Minor doc updates, along with a bug fix.
(#535)