fix triggers logic, and remove childs on properly transition