added Comparator and fixed some errors -- Entropy Estimator still in progress