Lexing edits, trying to finetune the use of a matrix