Lexicographer

Some other fixes too.