Now correctly matches slots to head of phrases, may want phrases but for now more information is better than less.