Inventory Tweaking

More changes to optimize the inventory system