Small change in grammar, added basics for lexer