minor changes to lexer-new.rs