Also adjust some comment wording / spelling and reorder header #includes.
Attach a file by drag & drop or click to upload
