CS and docblock fixes

Third of a few pulls to replace #6.
Yeh, I've sorted all 3 of them already. :)