CS fixes + typo + doc