lexical structure fixes