Inventory and shop improvements