I'm still listening and figuring which of these changes I'll be incorporating, but you've been just the right amount of pedantic ;)
As for single-word vs two-words, I just picked one and tried to be consistent. I've seen it both ways too, but I think two words is more modern.