Improvements in comparison methods
Comparison works, basic matching works