Inventory Update

Small fix/additions to inventory code, and a simple test.