Some fixes, and the start of the docblock.