CS fix, docblocks, etc.