fixed edit remove bugs