Feature & semantic issue fix

Add: comparator
Fix: all does not run