fix macros, add comparators & currying