add some keys; remove some stuff