Improved tokenizer. anubhavDS-C brought in partially.