Fixed  up equip and unequip to remove errors and flow better