Fixed Inventory Changes

Patched up all the major bugs.