fix some matching issues, and add some params