Fix some items, remove others, add new ones