added stuff for lexicon, managed to break some other stuff.