Minor changes - comments, typos, whitespace.

Starting backporting with minor changes.