CS and docblock fixes

Third of a few pulls to replace #6.
It is, because of additional parameters, otherwise those would be lost.