Made some modifications to docs that got dropped during rebase conflict resolution.