Doc framework edits cont'd