fixed CS and minor problem