fixed bugs...  improved bulk add remove