fix remove and modify bugs