minor corrections to lexer
lexer fixed and verified