Minor rewrites

These need to be extracted from DOCS-1862 to avoid merge hell.

Signed-off-by: Sam Kleinman <samk@10gen.com>
some more fixes

Signed-off-by: Sam Kleinman <samk@10gen.com>