working on fixing set-related unification