cherry picked commit - misc spelling, spacing, comments, etc., corrections