lot of pending changes, including context, headword and initial data separation into traits