Mostly comment and newline fixes