Added a matcher.
Corrected Comparators.
Corrected Finder.