diff --git a/42sh/libft/src/sstr/ft_sstrdel.c b/42sh/libft/src/sstr/ft_sstrdel.c
index c0d618ac..fd044783 100644
--- a/42sh/libft/src/sstr/ft_sstrdel.c
+++ b/42sh/libft/src/sstr/ft_sstrdel.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <marvin@42.fr>                    +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/03 18:04:07 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/14 21:09:17 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/21 17:52:10 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -22,4 +22,5 @@ void	ft_sstrdel(char **sstr, int index)
 		sstr[i] = sstr[i + 1];
 		i++;
 	}
+	ft_strdel(sstr + index);
 }
diff --git a/42sh/src/builtin/builtin_env.c b/42sh/src/builtin/builtin_env.c
index 13a606a0..15ef430c 100644
--- a/42sh/src/builtin/builtin_env.c
+++ b/42sh/src/builtin/builtin_env.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/28 14:14:20 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 01:14:41 by wescande         ###   ########.fr       */
+/*   Updated: 2017/03/21 18:41:06 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,10 +16,10 @@
 static int	env_usage(int arg_miss, char c)
 {
 	if (arg_miss)
-		ft_dprintf(2, "{red}env: option requires an argument -- u{eoc}\n");
+		SH_ERR("env: option requires an argument -- u");
 	else if (c)
-		ft_dprintf(2, "{red}env: illegal option -- %c{eoc}\n", c);
-	ft_dprintf(2, "usage: %s\n", US_ENV);
+		SH_ERR("env: illegal option -- %c", c);
+	SH_ERR("usage: %s", US_ENV);
 	return (1);
 }
 
diff --git a/42sh/src/builtin/builtin_unsetenv.c b/42sh/src/builtin/builtin_unsetenv.c
index 61069a81..d014efd9 100644
--- a/42sh/src/builtin/builtin_unsetenv.c
+++ b/42sh/src/builtin/builtin_unsetenv.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2016/11/28 14:29:17 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 17:40:31 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/21 17:51:37 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/exec/plaunch_builtin.c b/42sh/src/exec/plaunch_builtin.c
index 00215451..774171d4 100644
--- a/42sh/src/exec/plaunch_builtin.c
+++ b/42sh/src/exec/plaunch_builtin.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/07 15:48:24 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/20 15:50:12 by gwojda           ###   ########.fr       */
+/*   Updated: 2017/03/21 18:10:21 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/exec/plaunch_if.c b/42sh/src/exec/plaunch_if.c
index 64044393..1e4cb74d 100644
--- a/42sh/src/exec/plaunch_if.c
+++ b/42sh/src/exec/plaunch_if.c
@@ -6,7 +6,7 @@
 /*   By: wescande <wescande@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/07 17:26:53 by wescande          #+#    #+#             */
-/*   Updated: 2017/03/21 00:53:01 by wescande         ###   ########.fr       */
+/*   Updated: 2017/03/21 18:10:08 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/exec/process_launch.c b/42sh/src/exec/process_launch.c
index 95f7575d..63b85bbe 100644
--- a/42sh/src/exec/process_launch.c
+++ b/42sh/src/exec/process_launch.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jhalford@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/13 22:21:19 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 01:26:45 by wescande         ###   ########.fr       */
+/*   Updated: 2017/03/21 18:11:33 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -64,7 +64,7 @@ int				process_launch(t_process *p)
 		process_free(p, 0);
 		return (1);
 	}
-		DG("FORK");
+	DG("FORK");
 	p->pid = pid;
 	process_setgroup(p, pid);
 	if (p->fdin != STDIN)
diff --git a/42sh/src/exec/redirect_greatand.c b/42sh/src/exec/redirect_greatand.c
index 09beb928..d5e2e573 100644
--- a/42sh/src/exec/redirect_greatand.c
+++ b/42sh/src/exec/redirect_greatand.c
@@ -6,7 +6,7 @@
 /*   By: jhalford <jack@crans.org>                  +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/02/06 22:12:31 by jhalford          #+#    #+#             */
-/*   Updated: 2017/03/21 17:40:36 by jhalford         ###   ########.fr       */
+/*   Updated: 2017/03/21 17:41:36 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
diff --git a/42sh/src/glob/command_getoutput.c b/42sh/src/glob/command_getoutput.c
index fdab45d0..18da3edc 100644
--- a/42sh/src/glob/command_getoutput.c
+++ b/42sh/src/glob/command_getoutput.c
@@ -6,7 +6,7 @@
 /*   By: wescande <wescande@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2017/03/14 19:44:25 by wescande          #+#    #+#             */
-/*   Updated: 2017/03/21 01:21:38 by wescande         ###   ########.fr       */
+/*   Updated: 2017/03/21 18:15:53 by jhalford         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */