diff --git a/inc/cub3d.h b/inc/cub3d.h
index a53c33e..853a6fe 100644
--- a/inc/cub3d.h
+++ b/inc/cub3d.h
@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/15 12:22:29 by qmennen       #+#    #+#                 */
-/*   Updated: 2025/06/10 19:36:23 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/06/10 20:44:48 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,6 +19,7 @@
 # define WIDTH 1920
 # define HEIGHT 1080
 # define TITLE "Cub3D"
+
 # define ATTACK_DAMAGE 0.05f
 # define INITIAL_BATTERY 0.5f
 # define BATTERY_RATE 0.01f
diff --git a/src/parser/map_create.c b/src/parser/map_create.c
index b0f33b3..e71378a 100644
--- a/src/parser/map_create.c
+++ b/src/parser/map_create.c
@@ -6,7 +6,7 @@
 /*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/23 12:21:13 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/06/03 13:24:13 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/06/10 20:34:23 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -55,7 +55,7 @@ static int	map_validate_and_finalize(t_game **game, t_tile **grid)
 {
 	if (!enclosed_map((*game)->map))
 	{
-		ft_putendl_fd("Map is not enclosed", STDERR_FILENO);
+		ft_putstr_fd("Error: Map is not enclosed\n", STDERR_FILENO);
 		grid_free(grid, (*game)->map->height);
 		return (FAILURE);
 	}
diff --git a/src/parser/parse_args.c b/src/parser/parse_args.c
index 754841b..6ea995a 100644
--- a/src/parser/parse_args.c
+++ b/src/parser/parse_args.c
@@ -6,7 +6,7 @@
 /*   By: whaffman <whaffman@student.codam.nl>         +#+                     */
 /*                                                   +#+                      */
 /*   Created: 2025/04/23 12:17:49 by whaffman      #+#    #+#                 */
-/*   Updated: 2025/04/25 11:36:47 by whaffman      ########   odam.nl         */
+/*   Updated: 2025/06/10 20:30:06 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -23,11 +23,7 @@ int	parse_args(const char *mapfile, t_game *game)
 		return (FAILURE);
 	}
 	if (!parse_file(buffer, game))
-	{
-		ft_putstr_fd("Error parsing map file\n", 2);
-		free(buffer);
-		return (FAILURE);
-	}
+		return (free(buffer), FAILURE);
 	free(buffer);
 	return (SUCCESS);
 }
diff --git a/src/parser/parse_config_line.c b/src/parser/parse_config_line.c
index 4794e6c..2f75565 100644
--- a/src/parser/parse_config_line.c
+++ b/src/parser/parse_config_line.c
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   parse_config_line.c                                :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/04/22 13:10:06 by whaffman          #+#    #+#             */
-/*   Updated: 2025/06/10 15:47:23 by qmennen          ###   ########.fr       */
+/*                                                        ::::::::            */
+/*   parse_config_line.c                                :+:    :+:            */
+/*                                                     +:+                    */
+/*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
+/*                                                   +#+                      */
+/*   Created: 2025/04/22 13:10:06 by whaffman      #+#    #+#                 */
+/*   Updated: 2025/06/10 20:33:42 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -61,7 +61,6 @@ int	parse_config_line(char *line, t_map *map)
 	if (handler == NULL)
 		return (ft_putstr_fd("Error: Invalid config token\n", 2), FAILURE);
 	if (handler(token, map) == 0)
-		return (ft_putstr_fd("Error: Failed to handle config token\n", 2),
-			FAILURE);
+		return (FAILURE);
 	return (SUCCESS);
 }
diff --git a/src/parser/parse_handlers.c b/src/parser/parse_handlers.c
index fe23b88..9faefe4 100644
--- a/src/parser/parse_handlers.c
+++ b/src/parser/parse_handlers.c
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
-/*                                                        :::      ::::::::   */
-/*   parse_handlers.c                                   :+:      :+:    :+:   */
-/*                                                    +:+ +:+         +:+     */
-/*   By: qmennen <qmennen@student.codam.nl>         +#+  +:+       +#+        */
-/*                                                +#+#+#+#+#+   +#+           */
-/*   Created: 2025/06/03 14:38:12 by whaffman          #+#    #+#             */
-/*   Updated: 2025/06/04 17:57:18 by qmennen          ###   ########.fr       */
+/*                                                        ::::::::            */
+/*   parse_handlers.c                                   :+:    :+:            */
+/*                                                     +:+                    */
+/*   By: qmennen <qmennen@student.codam.nl>           +#+                     */
+/*                                                   +#+                      */
+/*   Created: 2025/06/03 14:38:12 by whaffman      #+#    #+#                 */
+/*   Updated: 2025/06/10 20:43:07 by whaffman      ########   odam.nl         */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -31,7 +31,7 @@ int	handle_wall(char *token, t_map *map)
 		if (ft_strcmp(token, wall_tokens[i]) == 0)
 		{
 			if (map->textures[i] != NULL)
-				return (FAILURE);
+				return (ft_putstr_fd("Error: Wall already set\n", 2), FAILURE);
 			map->textures[i] = load_texture(texture_path);
 			if (map->textures[i] == NULL)
 				return (FAILURE);