Fixed some more Tokenizer bugs.  Parser is a wreck at the moment.  All tests pass.