add remove, test it, fix up bench a bit