Fixed problems with the grammar and lexer.
More fixes.