Fix to best/fast methods of matching; more to come.