add a couple of thing and remove some entries