middle of the bug fixes related to unification