Tokenizer Implemented.
Minor changes in some files.