Changed Inventory and Types- fixed bugs