fixed CS and minor problemù