tweak strings, comments so they handle unterminated and no \r\n inside strings.