Update comments and fix up whitespace while we're here.
Attach a file by drag & drop or click to upload
