GearSwap v0.812 - More bugfixing