Bit more work on lexicon