Docblocks and other cs improvements