improved matching + fixed matching of comments