headword dict building, fixes still nec