Some lexicon (incl. HTML) improvements