TermsDisambiguator implemented
removed minor warnings