Fix CS and update docs