fix some line ending issues in source
fix a couple more formatting faux pas