Thanks guys, I'm bringing the bike in for adjustment soon so I'll pick up a master link while I'm there, and see if they'll give me a quick lesson in chain repair. The tool also has a spoke wrench, so I'll talk to them about spare spokes too. Not sure where I'd carry them though, zip-tie to a frame tube?