Added new items and fixed some bugs