Superminor copy stuff

I'm just getting around the code base and fixing super-minor stuff, subscriptions to follow later today. Merge or reject at will.