diff --git a/42sh/src/lexer/lexer_great.c b/42sh/src/lexer/lexer_great.c
index 8bbb462b..7e43e814 100644
--- a/42sh/src/lexer/lexer_great.c
+++ b/42sh/src/lexer/lexer_great.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/03 12:06:35 by jhalford          #+#    #+#             */
-/*   Updated: 2017/02/25 20:12:58 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/05 18:20:02 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,10 +36,7 @@ int		lexer_great(t_list **alst, t_lexer *lexer)
 		lexer->state = DEFAULT;
 		return (lexer_lex(&(*alst)->next, lexer));
 	}
-	else
-	{
-		token->type = TK_GREAT;
-		lexer->state = DEFAULT;
-		return (lexer_lex(&(*alst)->next, lexer));
-	}
+	token->type = TK_GREAT;
+	lexer->state = DEFAULT;
+	return (lexer_lex(&(*alst)->next, lexer));
 }
diff --git a/42sh/src/lexer/lexer_greatand.c b/42sh/src/lexer/lexer_greatand.c
index af86cb7f..4f802455 100644
--- a/42sh/src/lexer/lexer_greatand.c
+++ b/42sh/src/lexer/lexer_greatand.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/03 11:56:58 by jhalford          #+#    #+#             */
-/*   Updated: 2017/02/25 20:11:03 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/05 18:23:55 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,19 +18,22 @@ int		lexer_greatand(t_list **alst, t_lexer *lexer)
 
 	token = (*alst)->content;
 	token->type = TK_GREATAND;
-	if (ft_isdigit(lexer->str[lexer->pos]))
+/*	if (ft_isdigit(lexer->str[lexer->pos]))
 	{
-		token_append(token, lexer, 0, 0);
-		lexer->pos++;
-		return (lexer_greatand(alst, lexer));
-	}
-	else if (lexer->str[lexer->pos] == '-')
-	{
-		token_append(token, lexer, 0, 0);
-		lexer->pos++;
+//		token_append(token, lexer, 0, 0);
+//		lexer->pos++;
+//		DG();
 		lexer->state = DEFAULT;
 		return (lexer_lex(&(*alst)->next, lexer));
 	}
+	else if (lexer->str[lexer->pos] == '-')
+	{
+//		token_append(token, lexer, 0, 0);
+//		lexer->pos++;
+		lexer->state = DEFAULT;
+		return (lexer_lex(&(*alst)->next, lexer));
+	}*/
 	lexer->state = DEFAULT;
-	return (lexer_lex(alst, lexer));
+	return (lexer_lex(&(*alst)->next, lexer));
+	//return (lexer_lex(alst, lexer));
 }
diff --git a/42sh/src/lexer/lexer_less.c b/42sh/src/lexer/lexer_less.c
index 0aa0174c..92d6bf45 100644
--- a/42sh/src/lexer/lexer_less.c
+++ b/42sh/src/lexer/lexer_less.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/03 12:06:53 by jhalford          #+#    #+#             */
-/*   Updated: 2017/02/25 20:11:17 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/05 18:19:48 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -37,10 +37,7 @@ int		lexer_less(t_list **alst, t_lexer *lexer)
 		ft_lsteadd(&lexer->heredoc_stack, ft_lstnew(alst, sizeof(alst)));
 		return (lexer_lex(&(*alst)->next, lexer));
 	}
-	else
-	{
-		token->type = TK_LESS;
-		lexer->state = DEFAULT;
-		return (lexer_lex(&(*alst)->next, lexer));
-	}
+	token->type = TK_LESS;
+	lexer->state = DEFAULT;
+	return (lexer_lex(&(*alst)->next, lexer));
 }
diff --git a/42sh/src/lexer/lexer_lessand.c b/42sh/src/lexer/lexer_lessand.c
index d0e79268..1e5cfb20 100644
--- a/42sh/src/lexer/lexer_lessand.c
+++ b/42sh/src/lexer/lexer_lessand.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/12/03 11:58:51 by jhalford          #+#    #+#             */
-/*   Updated: 2017/02/25 20:11:10 by ariard           ###   ########.fr       */
+/*   Updated: 2017/03/05 18:05:39 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,11 +18,14 @@ int		lexer_lessand(t_list **alst, t_lexer *lexer)
 
 	token = (*alst)->content;
 	token->type = TK_LESSAND;
-	if (ft_isdigit(lexer->str[lexer->pos]))
+	lexer->state = DEFAULT;
+	return (lexer_lex(&(*alst)->next, lexer));
+/*	if (ft_isdigit(lexer->str[lexer->pos]))
 	{
 		token_append(token, lexer, 0, 0);
 		lexer->pos++;
-		return (lexer_lessand(alst, lexer));
+		lexer->state = DEFAULT;
+		return (lexer_lex(&(*alst)->next, lexer));
 	}
 	else if (lexer->str[lexer->pos] == '-')
 	{
@@ -32,5 +35,5 @@ int		lexer_lessand(t_list **alst, t_lexer *lexer)
 		return (lexer_lex(&(*alst)->next, lexer));
 	}
 	lexer->state = DEFAULT;
-	return (lexer_lex(alst, lexer));
+	return (lexer_lex(alst, lexer));*/
 }
diff --git a/42sh/src/lexer/lexer_lex.c b/42sh/src/lexer/lexer_lex.c
index c5900571..791d9ab9 100644
--- a/42sh/src/lexer/lexer_lex.c
+++ b/42sh/src/lexer/lexer_lex.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/09 17:08:51 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/05 16:28:15 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/05 18:32:09 by wescande         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -51,6 +51,8 @@ int		lexer_lex(t_list **alst, t_lexer *lexer)
 {
 	t_token	*token;
 
+	ft_putnbr(__LINE__);
+	ft_putendl(__FILE__);
 	if (lexer->str[lexer->pos] == 0)
 		return (lexer_end(alst, lexer));
 	if (!*alst)