fix CS and add missing/wrong header