various whitespace and comments fixes (nw)