Address review comments

A few typos and other changes based on the comments
from reviewing the previous changeset.

Change-Id: I0457db3496997586ad8e0432eea3eeda1641fae8
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>