Fixed CS and typos