More fixes. Problem is we are not testing for comment sequences which maybe in quotes.