rewrote Tokenizer (comment old code) + comment Parser code for revision