diff --git a/libft/Makefile b/libft/Makefile
index 56257f8..b4d231d 100644
--- a/libft/Makefile
+++ b/libft/Makefile
@@ -6,7 +6,7 @@
 #    By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+         #
 #                                                 +#+#+#+#+#+   +#+            #
 #    Created: 2024/01/22 07:21:18 by mmoussou          #+#    #+#              #
-#    Updated: 2024/07/29 19:27:29 by adjoly           ###   ########.fr        #
+#    Updated: 2024/08/01 17:48:26 by adjoly           ###   ########.fr        #
 #                                                                              #
 # **************************************************************************** #
 
@@ -14,7 +14,7 @@ SHELL = bash
 
 CC = cc
 
-CFLAGS = -Wall -Werror -Wextra -pipe -fPIE
+CFLAGS = -Wall -Werror -Wextra -pipe -fPIE -g
 
 INCLUDE = ./include
 
diff --git a/libft/src/linked_lists/ft_lstclear.c b/libft/src/linked_lists/ft_lstclear.c
index 8bb19a4..1810e2f 100644
--- a/libft/src/linked_lists/ft_lstclear.c
+++ b/libft/src/linked_lists/ft_lstclear.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angoulem      +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2023/11/08 21:44:04 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/05/22 11:35:58 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/01 17:49:16 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,10 +18,11 @@ void	ft_lstclear(t_list **lst, void (*del)(void *))
 
 	if (!lst || !del)
 		return ;
-	while (*lst && lst && del)
+	while (lst && *lst && del)
 	{
 		tmp = (*lst)->next;
-		ft_lstdelone(*lst, del);
+		if ((*lst)->content)
+			ft_lstdelone(*lst, del);
 		*lst = tmp;
 	}
 }
diff --git a/src/exec/heredoc.c b/src/exec/heredoc.c
index 4f2d91a..a86531c 100644
--- a/src/exec/heredoc.c
+++ b/src/exec/heredoc.c
@@ -6,7 +6,7 @@
 /*   By: mmoussou <mmoussou@student.42angouleme.fr  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/20 09:19:39 by mmoussou          #+#    #+#             */
-/*   Updated: 2024/07/16 13:53:57 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/01 17:51:13 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/src/exec/heredoc_utils.c b/src/exec/heredoc_utils.c
index 23992f2..365664e 100644
--- a/src/exec/heredoc_utils.c
+++ b/src/exec/heredoc_utils.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/07/10 01:14:10 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/15 17:03:12 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/01 17:58:58 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -32,13 +32,13 @@ void	ft_lstclear_till_nxt(t_list **lst, void (*del)(void *))
 {
 	t_list	*tmp;
 
+	if (!lst || !del)
+		return ;
 	if (!(*lst)->next)
 	{
 		free(*lst);
 		return ;
 	}
-	if (!lst || !del)
-		return ;
 	while (lst && *lst && (*lst)->next && del)
 	{
 		tmp = (*lst)->next;
diff --git a/src/parsing/get_cmd_list.c b/src/parsing/get_cmd_list.c
index be14e35..90aed11 100644
--- a/src/parsing/get_cmd_list.c
+++ b/src/parsing/get_cmd_list.c
@@ -6,7 +6,7 @@
 /*   By: adjoly <adjoly@student.42angouleme.fr>     +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2024/05/31 12:47:13 by adjoly            #+#    #+#             */
-/*   Updated: 2024/07/20 17:11:41 by adjoly           ###   ########.fr       */
+/*   Updated: 2024/08/01 18:07:13 by adjoly           ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -41,8 +41,7 @@ t_list	*get_cmd_list(t_list *list)
 	tmp = tmp->next;
 	while (tmp)
 	{
-		ft_lstadd_back(&cmd_list, ft_lstnew(get_redir_fd(tmp->content, \
-							((t_token *)tmp->content)->redirection)));
+		ft_lstadd_back(&cmd_list, make_lst(tmp));
 		if (!ft_lstlast(cmd_list)->content)
 		{
 			ft_lstclear(&cmd_list, &free_cmd);