more doc tweaks (and fix for the bad merge)