Adding more features to the lexer and parser.