Add docs and address comments.

FIXUP before submitting.