More CS and doc fixes