fixup CRLF
variable name changes, comment cleanup, more eol cleanup