New spec head "matching". Changed comments. Bugfixes.