Updated listing of special tokens. Began rewrite of AST based on new grammar.