CS and docblock fixes

Third of a few pulls to replace #6.
Ok, I do the reverse normally. I'll revert that change...