Also fixes various bugs and things I noticed during testing, &c. There's more that I'd like to clean up around this stuff, but I have to push on so I can get the custom spoke feature-complete.