CS and minor changes