fix CS and headers