many pendig changes including contexts, headwords and some code reorganization