Updated grammar, tokens, parser as of issue #2