GearSwap - Two more adjustments-_-
Merge pull request #842 from Windower/4.1-dev

GearSwap - Two more adjustments-_-