fixes to line length and comments