CS fixes + doc + small fixes