CS fixes + doc