CS fixing and doc