diff --git a/Makefile b/Makefile
index 293b2f8..42895f0 100644
--- a/Makefile
+++ b/Makefile
@@ -6,7 +6,7 @@
 #    By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2023/07/28 00:35:01 by tomoron           #+#    #+#              #
-#    Updated: 2024/03/25 12:33:26 by tomoron          ###   ########.fr        #
+#    Updated: 2024/03/26 09:08:03 by marde-vr         ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -21,10 +21,11 @@ SRCS_RAW =	main.c\
 			pwd.c\
 			parsing.c\
 			debug.c\
-			env_to_char_tab.c\
+			env_utils.c\
 			parsing_var.c\
 			path.c\
 			here_doc.c\
+			here_doc_utils.c\
 			export.c\
 			input_redirections.c\
 			output_redirections.c\
diff --git a/srcs/commands.c b/srcs/commands.c
index 8e5a1a8..82f7113 100644
--- a/srcs/commands.c
+++ b/srcs/commands.c
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/03/05 18:22:15 by marde-vr          #+#    #+#             */
-/*   Updated: 2024/03/26 09:10:12 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/03/26 09:19:40 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -65,8 +65,8 @@ char	**get_cmd_args(t_msh *msh)
 	if (!cmd_args || !msh->fds)
 		ft_exit(msh, 1);
 	cur_cmd = msh->cmds;
-	i = -1;
-	while (++i < args_count)
+	i = 0;
+	while (i < args_count)
 	{
 		if (cur_cmd->type == ARG)
 		{
@@ -74,6 +74,7 @@ char	**get_cmd_args(t_msh *msh)
 				cmd_args[i] = remove_path(cur_cmd->token);
 			else
 				cmd_args[i] = cur_cmd->token;
+			i++;
 		}
 		else
 			cur_cmd = cur_cmd->next;
diff --git a/srcs/exit.c b/srcs/exit.c
index 59517f1..5c36f0f 100755
--- a/srcs/exit.c
+++ b/srcs/exit.c
@@ -6,7 +6,7 @@
 /*   By: marde-vr <marde-vr@42angouleme.fr>         +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/02/07 16:04:11 by tomoron           #+#    #+#             */
-/*   Updated: 2024/03/26 08:59:44 by marde-vr         ###   ########.fr       */
+/*   Updated: 2024/03/26 09:14:22 by marde-vr         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -20,18 +20,17 @@ void	numeric_arg_err(char *arg, int *exit_code)
 	*exit_code = 2;
 }
 
-void	get_exit_bt_return_code(t_msh *msh)
+void	get_exit_bt_return_code(t_msh *msh, int *exit_code)
 {
 	t_cmd	*cur_cmd;
-	int		exit_code;
 
 	cur_cmd = msh->cmds->next;
 	if (cur_cmd && cur_cmd->type == ARG && !ft_strisnbr(cur_cmd->token))
-		numeric_arg_err(cur_cmd->token, &exit_code);
+		numeric_arg_err(cur_cmd->token, exit_code);
 	else if (cur_cmd && cur_cmd->type == ARG)
-		exit_code = (unsigned char)ft_atoi(cur_cmd->token);
+		*exit_code = (unsigned char)ft_atoi(cur_cmd->token);
 	else
-		exit_code = g_return_code;
+		*exit_code = g_return_code;
 }
 
 void	exit_bt(t_msh *msh)
@@ -50,7 +49,7 @@ void	exit_bt(t_msh *msh)
 	}
 	else
 	{
-		get_exit_bt_return_code(msh);
+		get_exit_bt_return_code(msh, &exit_code);
 		if (msh->fds)
 		{
 			cmd_count = get_cmd_count(msh->cmds);