Inventory improvements

This is good enough for now. Need to work on some bigger pieces.