Improved corpus parsing.
Added new comparator and improved bi-grams.