Fix bug that would cause players to keep helmets, improve inventory
saving, restore essentials compat for kits