Some more doc changes and a couple minor code tweaks.