fixup! Fixup some review issues.
Documentation updates