Fixed a few serious bugs (brackets were returning as braces) and reorganized the entire system to return a TokenStream, which really cleaned up the parser.