unification and fixing some stuff