updated grammar to complete lexer