CS fixes/missing docblocks fixes