progress on lexer
more progess on lexer