more unification fixes
less assertions, more errors