GearSwap - Comment changes and minor reg change