Modify string macthing, add comment matching, shuffle some groups