fix and remove some entries