Fix improper CRLF line-endings in repository

Also fixes minor merge-induced regressions in comments

Author: pmai