fixed bug, fixed remove