Fix Most of the inventory problems