Bug fixes for equip functionality, testing