update BinderActivate + somes clean