Inventory + Items + fixes