Main: minor tweaks
Matcher: almost done