lexicon included. Other improvements