Fix some items and add more items