GearSwap/Pointwatch minor updates