- new matching interations
- bug and typo fixes