grammar updates; added lexer;