fixed string matching and added multiline comment filtering