Continued work on lexer