diff --git a/allocator/include/aq/internal_vg_funcs.h b/allocator/include/aq/internal_vg_funcs.h
index b90530ef..152a278f 100644
--- a/allocator/include/aq/internal_vg_funcs.h
+++ b/allocator/include/aq/internal_vg_funcs.h
@@ -6,7 +6,7 @@
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/12 22:20:30 by maiboyer          #+#    #+#             */
-/*   Updated: 2024/10/12 17:51:02 by rparodi          ###   ########.fr       */
+/*   Updated: 2024/10/15 21:25:17 by maiboyer         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -27,11 +27,15 @@
 #  endif
 # endif
 
+# ifdef _INCLUDE_VALGRIND
+#  undef _INCLUDE_VALGRIND
+# endif
+
 # ifdef _INCLUDE_VALGRIND
 #  ifdef NVALGRIND
 #   undef NVALGRIND
 #  endif
-#  define VGFUNCS
+// #  define VGFUNCS //slt froz
 #  include <valgrind/memcheck.h>
 #  include <valgrind/valgrind.h>
 # endif
diff --git a/exec/Filelist.exec.mk b/exec/Filelist.exec.mk
index 959253b5..53bc9948 100644
--- a/exec/Filelist.exec.mk
+++ b/exec/Filelist.exec.mk
@@ -14,11 +14,11 @@ run_arithmetic/_to_ast_node                                                   \
 run_arithmetic/arithmetic                                                     \
 run_arithmetic/arithmetic_operation                                           \
 run_arithmetic/operator_bis                                                   \
-run_ast/_ast_into_str                                                         \
-run_ast/_ast_into_str2                                                        \
-run_ast/_ast_into_str3                                                        \
-run_ast/_ast_into_str4                                                        \
-run_ast/_ast_into_str5                                                        \
+run_ast/_ast_into_str_exp                                                     \
+run_ast/_ast_into_str_get_str                                                 \
+run_ast/_ast_into_str_into                                                    \
+run_ast/_ast_into_str_main                                                    \
+run_ast/_ast_into_str_star                                                    \
 run_ast/_get_pid                                                              \
 run_ast/_run_exit_code                                                        \
 run_ast/_run_exp_operators                                                    \
diff --git a/exec/src/run_ast/_ast_into_str3.c b/exec/src/run_ast/_ast_into_str_exp.c
similarity index 98%
rename from exec/src/run_ast/_ast_into_str3.c
rename to exec/src/run_ast/_ast_into_str_exp.c
index 3181b190..c075f2fe 100644
--- a/exec/src/run_ast/_ast_into_str3.c
+++ b/exec/src/run_ast/_ast_into_str_exp.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   _ast_into_str3.c                                   :+:      :+:    :+:   */
+/*   _ast_into_str_exp.c                                :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
diff --git a/exec/src/run_ast/_ast_into_str2.c b/exec/src/run_ast/_ast_into_str_get_str.c
similarity index 98%
rename from exec/src/run_ast/_ast_into_str2.c
rename to exec/src/run_ast/_ast_into_str_get_str.c
index 86ee5654..c6bb8993 100644
--- a/exec/src/run_ast/_ast_into_str2.c
+++ b/exec/src/run_ast/_ast_into_str_get_str.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   _ast_into_str2.c                                   :+:      :+:    :+:   */
+/*   _ast_into_str_get_str.c                            :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
diff --git a/exec/src/run_ast/_ast_into_str4.c b/exec/src/run_ast/_ast_into_str_into.c
similarity index 96%
rename from exec/src/run_ast/_ast_into_str4.c
rename to exec/src/run_ast/_ast_into_str_into.c
index 2bba9763..ad468aaa 100644
--- a/exec/src/run_ast/_ast_into_str4.c
+++ b/exec/src/run_ast/_ast_into_str_into.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   _ast_into_str4.c                                   :+:      :+:    :+:   */
+/*   _ast_into_str_into.c                               :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
diff --git a/exec/src/run_ast/_ast_into_str.c b/exec/src/run_ast/_ast_into_str_main.c
similarity index 93%
rename from exec/src/run_ast/_ast_into_str.c
rename to exec/src/run_ast/_ast_into_str_main.c
index dfe7ef5c..723c5212 100644
--- a/exec/src/run_ast/_ast_into_str.c
+++ b/exec/src/run_ast/_ast_into_str_main.c
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   _ast_into_str.c                                    :+:      :+:    :+:   */
+/*   _ast_into_str_main.c                               :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/09/14 12:26:51 by maiboyer          #+#    #+#             */
-/*   Updated: 2024/10/14 15:02:01 by maiboyer         ###   ########.fr       */
+/*   Updated: 2024/10/15 21:30:02 by maiboyer         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,6 +31,8 @@ t_error	_word_split_loop(\
 	{
 		if (val.do_expand)
 		{
+			if (val.value == NULL)
+				val.value = "";
 			if (str_split(val.value, " ", &split))
 				return (ERROR);
 			while (!vec_str_pop_front(&split, &stmp))
diff --git a/exec/src/run_ast/_ast_into_str5.c b/exec/src/run_ast/_ast_into_str_star.c
similarity index 97%
rename from exec/src/run_ast/_ast_into_str5.c
rename to exec/src/run_ast/_ast_into_str_star.c
index 0c24f2e3..0bf0043c 100644
--- a/exec/src/run_ast/_ast_into_str5.c
+++ b/exec/src/run_ast/_ast_into_str_star.c
@@ -1,7 +1,7 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   _ast_into_str5.c                                   :+:      :+:    :+:   */
+/*   _ast_into_str_star.c                               :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: maiboyer <maiboyer@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
diff --git a/includes/test b/includes/test
deleted file mode 120000
index 53104612..00000000
--- a/includes/test
+++ /dev/null
@@ -1 +0,0 @@
-../test/include/test
\ No newline at end of file