diff --git a/42sh/src/exec/process_redirect.c b/42sh/src/exec/process_redirect.c
index 574448f0..6b45872d 100644
--- a/42sh/src/exec/process_redirect.c
+++ b/42sh/src/exec/process_redirect.c
@@ -30,11 +30,9 @@ int		process_redirect(t_process *p)
 	int		i;
 
 	redirs = p->redirs;
-	DG("process redirect");
 	while (redirs)
 	{
 		redir = redirs->content;
-		DG("process redirect 2, type=[%i]", redir->type);
 		if (redir->n > 9)
 			return (bad_fd(redir->n));
 		i = 0;
diff --git a/42sh/src/job-control/job_wait.c b/42sh/src/job-control/job_wait.c
index 6cd87253..62f5ebef 100644
--- a/42sh/src/job-control/job_wait.c
+++ b/42sh/src/job-control/job_wait.c
@@ -17,7 +17,6 @@ int		job_wait(int id)
 	pid_t	pid;
 	int		status;
 
-	DG("gonna wait [%i]", id);
 	if (job_is_stopped(id))
 		return (0);
 	job_update_status();
diff --git a/42sh/src/lexer/lexer_end.c b/42sh/src/lexer/lexer_end.c
index 7dccf710..2ec70dd2 100644
--- a/42sh/src/lexer/lexer_end.c
+++ b/42sh/src/lexer/lexer_end.c
@@ -4,7 +4,6 @@ int		lexer_end(t_list **alst, t_lexer *lexer)
 {
 	t_token		*token;
 
-	DG("check");
 	if ((*alst && (lexer->state == QUOTE
 			|| lexer->state == DQUOTE
 			|| lexer->state == BQUOTE))
diff --git a/42sh/src/lexer/lexer_lex.c b/42sh/src/lexer/lexer_lex.c
index 2defdb6d..f6614e5a 100644
--- a/42sh/src/lexer/lexer_lex.c
+++ b/42sh/src/lexer/lexer_lex.c
@@ -44,7 +44,6 @@ int		lexer_lex(t_list **alst, t_lexer *lexer)
 {
 	t_token	*token;
 
-	DG("check 01, state=[%i]", lexer->state);
 	if (lexer->str[lexer->pos] == 0)
 		return (lexer_end(alst, lexer));
 	if (!*alst)
diff --git a/42sh/src/lexer/lexer_sep.c b/42sh/src/lexer/lexer_sep.c
index 581f2395..a393f714 100644
--- a/42sh/src/lexer/lexer_sep.c
+++ b/42sh/src/lexer/lexer_sep.c
@@ -18,6 +18,7 @@ int		lexer_sep(t_list **alst, t_lexer *lexer)
 	char	c;
 	char	cn;
 
+	lexer->state = DEFAULT;
 	if (*alst)
 	{
 		token = (*alst)->content;
diff --git a/42sh/src/lexer_dless.c b/42sh/src/lexer_dless.c
index cd9cba17..6f0644b9 100644
--- a/42sh/src/lexer_dless.c
+++ b/42sh/src/lexer_dless.c
@@ -28,9 +28,11 @@ int		lexer_dless(t_list **alst, t_lexer *lexer)
 	{
 		pop(&lexer->stack);
 		pop(&lexer->heredoc_stack);
-		return (0);
+		while (lexer->str[++lexer->pos])
+			;
 	}
-	while (lexer->str[lexer->pos])
-		token_append_char(heredoc_tok, lexer->str[lexer->pos++], 0, 0);
+	else
+		while (lexer->str[lexer->pos])
+			token_append_char(heredoc_tok, lexer->str[lexer->pos++], 0, 0);
 	return (lexer_end(alst, lexer));
 }
diff --git a/42sh/src/main/main.c b/42sh/src/main/main.c
index 17c882bc..3d2df86d 100644
--- a/42sh/src/main/main.c
+++ b/42sh/src/main/main.c
@@ -54,25 +54,20 @@ int		interactive_shell()
 	ast = NULL;
 	do {
 		ft_strappend(&lexer.str, readline(stack_to_prompt(lexer.stack)));
-		DG("check 0");
 		if (get_lexer_stack(lexer) == BACKSLASH)
 			pop(&lexer.stack);
 		else if (get_lexer_stack(lexer) == DLESS)
 			lexer.state = DLESS;
-		DG("check 1");
 		ltoken = ft_lstlast(token);
 		if (lexer_lex((token ? &ltoken : &token), &lexer))
 			return (1);
-		DG("check 2");
 		DG("[{mag}%s{eoc}] stack=[%i] state=[%i]", lexer.str, lexer.stack ? *(int*)lexer.stack->content : 0, lexer.state);
-		DG("check 3");
 		token_print(token);
 	} while (get_lexer_stack(lexer));
 	if (bquotes_expand(&token))
 		return (1);
 	if (!token)
 		return (0);
-	token_print(token);
 	if (ft_parse(&ast, &token))
 		return (1);
 	btree_print(STDBUG, ast, &ft_putast);