wordset and ontology added, various other changes, end of day commit