diff --git a/handle_errors.c b/handle_errors.c
index 41c3ee6..b65ff32 100644
--- a/handle_errors.c
+++ b/handle_errors.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/03/01 13:29:05 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/03 19:11:02 by vmanzoni         ###   ########.fr       */
+/*   Updated: 2019/05/08 08:09:14 by vmanzoni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,15 +31,16 @@ void	print_error(char *s)
 void	print_error_extended(int error)
 {
 	if (error == 1)
-		ft_putstr("error: File contains char other than . # \\n found.\n");
+		ft_putstr("error: File contains char other than '.','#' and '\\n'.\n");
 	if (error == 2)
 		ft_putstr("error: File contains more than 2 \\n in a row.\n");
 	if (error == 3)
-		ft_putstr("error: File contains less than 1 tetrimino or more than 26.\n");
+		ft_putstr("error: File contains less than 1 tetrimino"
+					"or more than 26.\n");
 	if (error == 4)
 		ft_putstr("\n\nerror: This tetrimino has more or less than 4 #.\n");
 	if (error == 5)
-		ft_putstr("\n\nerror: This tetrimino # are not well connected.\n");
+		ft_putstr("\n\nerror: This tetrimino # are not all connected.\n");
 	exit(1);
 }
 
diff --git a/print_map_with_colors.c b/print_map_with_colors.c
index bb85c16..6eb4ea1 100644
--- a/print_map_with_colors.c
+++ b/print_map_with_colors.c
@@ -6,7 +6,7 @@
 /*   By: vmanzoni <vmanzoni@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2019/05/03 20:27:22 by vmanzoni          #+#    #+#             */
-/*   Updated: 2019/05/04 19:15:35 by vmanzoni         ###   ########.fr       */
+/*   Updated: 2019/05/08 08:04:05 by vmanzoni         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,62 +17,40 @@ void ft_putchar(char c)
 	write(1, &c, 1);
 }
 
-void ft_putchar_red(char c)
+void ft_putchar_color(char c, char color)
 {
-	write(1, RED, 5);
-	ft_putchar(c);
-	write(1, RESET, 5);
-}
-
-void ft_putchar_blue(char c)
-{
-	write(1, BLU, 5);
-	ft_putchar(c);
-	write(1, RESET, 5);
-}
-
-void ft_putchar_green(char c)
-{
-	write(1, GRN, 5);
-	ft_putchar(c);
-	write(1, RESET, 5);
-}
-
-void ft_putchar_yellow(char c)
-{
-	write(1, YEL, 5);
-	ft_putchar(c);
-	write(1, RESET, 5);
-}
-
-void ft_putchar_magenta(char c)
-{
-	write(1, MAG, 5);
-	ft_putchar(c);
-	write(1, RESET, 5);
-}
-
-void ft_putchar_cyan(char c)
-{
-	write(1, CYN, 5);
+	if (color == 'R')
+		write(1, RED, 5);
+	else if (color == 'B')
+		write(1, BLU, 5);
+	else if (color == 'G')
+		write(1, GRN, 5);
+	else if (color == 'Y')
+		write(1, YEL, 5);
+	else if (color == 'M')
+		write(1, MAG, 5);
+	else if (color == 'C')
+		write(1, CYN, 5);
+	else if (color == 'W')
+		write(1, RESET, 5);
 	ft_putchar(c);
 	write(1, RESET, 5);
 }
 
 void	ft_put_tetri_color(char c)
 {
-	if (c == 'A' || c == 'G' || c == 'M' || c == 'S')
-		ft_putchar_red(c);
-	else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Y')
-		ft_putchar_blue(c);
-	else if (c == 'C' || c == 'I' || c == 'O' || c == 'U' || c == 'Z')
-		ft_putchar_green(c);
+	if (c == 'A' || c == 'G' || c == 'M' || c == 'S' || c == 'Y')
+		ft_putchar_color(c, 'R');
+	else if (c == 'B' || c == 'H' || c == 'N' || c == 'T' || c == 'Z')
+		ft_putchar_color(c, 'B');
+	else if (c == 'C' || c == 'I' || c == 'O' || c == 'U')
+		ft_putchar_color(c, 'G');
 	else if (c == 'D' || c == 'J' || c == 'P' || c == 'V')
-		ft_putchar_yellow(c);
+		ft_putchar_color(c, 'Y');
 	else if (c == 'E' || c == 'K' || c == 'Q' || c == 'W')
-		ft_putchar_magenta(c);
+		ft_putchar_color(c, 'M');
 	else if (c == 'F' || c == 'L' || c == 'R' || c == 'X')
-		ft_putchar_cyan(c);
+		ft_putchar_color(c, 'C');
 	else
 		ft_putchar(c);
 }