diff --git a/bonus/ft_putnbr_base_bonus.c b/bonus/ft_putnbr_base_bonus.c
index 4d069f1..65c41df 100644
--- a/bonus/ft_putnbr_base_bonus.c
+++ b/bonus/ft_putnbr_base_bonus.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/17 12:16:44 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/21 12:16:33 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:25:19 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,8 +21,8 @@ static int	ft_putnbr_base_extra(unsigned int nbr, char *base, int base_size)
 	i = 1 + ft_putnbr_base_extra(nbr / base_size, base, base_size);
 	ft_putchar_fd(base[nbr % base_size], 1);
 	return (i);
-
 }
+
 int	ft_putnbr_base(unsigned int nbr, char *base, int base_size, int limit)
 {
 	if (nbr == 0 && limit != 0)
diff --git a/bonus/print_hex_bonus.c b/bonus/print_hex_bonus.c
index 55a9508..59bb548 100644
--- a/bonus/print_hex_bonus.c
+++ b/bonus/print_hex_bonus.c
@@ -6,24 +6,53 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/17 12:06:35 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/21 12:13:16 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:24:18 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ft_printf_bonus.h"
 #include <unistd.h>
 
+static int	padding_size(t_arg *arg, unsigned int nbr)
+{
+	int	padding;
+	int	nbr_size;
+
+	if (arg->padding < 0)
+		return (0);
+	padding = arg->padding;
+	nbr_size = nbr_size_base(nbr, 16);
+	if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
+		nbr_size = arg->dot;
+	padding = padding - nbr_size;
+	return (padding);
+}
+
+static int	print_nb_flags(t_arg *arg, unsigned int nbr)
+{
+	int	count;
+	int	padding;
+
+	padding = padding_size(arg, nbr);
+	count = 0;
+	if (arg->dot >= 0 || arg->zero < 0)
+		count += print_chars(padding, ' ');
+	if (arg->dot >= 0)
+		arg->zero = -1;
+	return (count);
+}
+
 int	print_hex(t_arg *arg, unsigned int nbr)
 {
 	int		count;
 
 	count = 0;
-	count += print_chars(arg->padding - nbr_size_base(nbr, 16), ' ');
-	if (nbr == 0)
+	count += print_nb_flags(arg, nbr);
+	if (nbr == 0 && arg->dot)
 	{
 		count += write(1, "0", 1);
-		count += print_chars(arg->zero - count, '0');
-		count += print_chars(arg->dot - count, '0');
+		count += print_chars(arg->zero - 1, '0');
+		count += print_chars(arg->dot - 1, '0');
 	}
 	else
 	{
@@ -34,9 +63,9 @@ int	print_hex(t_arg *arg, unsigned int nbr)
 		count += print_chars(arg->zero - count - nbr_size_base(nbr, 16), '0');
 		count += print_chars(arg->dot - nbr_size_base(nbr, 16), '0');
 		if (arg->arg == 'X')
-			count += ft_putnbr_base(nbr, "0123456789ABCDEF", 16, 2147483647);
+			count += ft_putnbr_base(nbr, "0123456789ABCDEF", 16, arg->dot);
 		else
-			count += ft_putnbr_base(nbr, "0123456789abcdef", 16, 2147483647);
+			count += ft_putnbr_base(nbr, "0123456789abcdef", 16, arg->dot);
 	}
 	return (count);
 }
diff --git a/bonus/print_number_bonus.c b/bonus/print_number_bonus.c
index 61ba0b5..3d8fef7 100644
--- a/bonus/print_number_bonus.c
+++ b/bonus/print_number_bonus.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/17 12:26:23 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/21 12:18:58 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:32:24 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,7 @@ static int	padding_size(int space, int plus, t_arg *arg, int nbr)
 		nbr_size = nbr_size_base(nbr * -1, 10);
 	else
 		nbr_size = nbr_size_base(nbr, 10);
-	if (arg->dot > nbr_size || arg->dot == 0)
+	if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
 		nbr_size = arg->dot;
 	padding = padding - nbr_size;
 	if (nbr < 0)
@@ -52,7 +52,8 @@ static int	print_nb_flags(t_arg *arg, int nbr)
 	count = 0;
 	if (arg->dot >= 0 || arg->zero < 0)
 		count += print_chars(padding, ' ');
-	count += print_chars(space, ' ');
+	if (nbr >= 0)
+		count += print_chars(space, ' ');
 	count += print_chars(plus, '+');
 	return (count);
 }
diff --git a/bonus/print_pointer_bonus.c b/bonus/print_pointer_bonus.c
index 19f3d72..2a8f403 100644
--- a/bonus/print_pointer_bonus.c
+++ b/bonus/print_pointer_bonus.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/17 12:19:16 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/20 15:03:57 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:18:06 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -25,7 +25,7 @@ int	print_pointer(t_arg *arg, unsigned long long p)
 		ft_putstr_fd("(nil)", 1);
 		return (5);
 	}
-	count += print_chars(arg->padding - nbr_size_base(p, 16), ' ');
+	count += print_chars(arg->padding - nbr_size_base(p, 16) - 2, ' ');
 	count += write(1, "0x", 2);
 	return (count + ft_putnbr_base_ll(p, "0123456789abcdef", 16));
 }
diff --git a/bonus/print_unsigned_bonus.c b/bonus/print_unsigned_bonus.c
index 1e9b780..3e88270 100644
--- a/bonus/print_unsigned_bonus.c
+++ b/bonus/print_unsigned_bonus.c
@@ -6,54 +6,37 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/17 12:26:23 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/21 12:29:02 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:22:44 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "ft_printf_bonus.h"
 #include <unistd.h>
 
-static int	padding_size(int space, int plus, t_arg *arg, int nbr)
+static int	padding_size(t_arg *arg, unsigned int nbr)
 {
 	int	padding;
 	int	nbr_size;
 
 	if (arg->padding < 0)
 		return (0);
-	padding = arg->padding - space - plus;
-	if (nbr < 0)
-		nbr_size = nbr_size_base(nbr * -1, 10);
-	else
-		nbr_size = nbr_size_base(nbr, 10);
-	if (arg->dot > nbr_size || arg->dot == 0)
+	padding = arg->padding;
+	nbr_size = nbr_size_base(nbr, 10);
+	if (arg->dot > nbr_size || (arg->dot == 0 && !nbr))
 		nbr_size = arg->dot;
 	padding = padding - nbr_size;
-	if (nbr < 0)
-		padding--;
 	return (padding);
 }
 
-static int	print_nb_flags(t_arg *arg, int nbr)
+static int	print_nb_flags(t_arg *arg, unsigned int nbr)
 {
 	int	count;
-	int	space;
 	int	padding;
-	int	plus;
 
-	if (arg->plus >= 0 && nbr > 0)
-		plus = 1;
-	else
-		plus = 0;
-	if (arg->plus >= 0 || arg->space < 0)
-		space = 0;
-	else
-		space = 1;
-	padding = padding_size(space, plus, arg, nbr);
+	padding = padding_size(arg, nbr);
 	count = 0;
 	if (arg->dot >= 0 || arg->zero < 0)
 		count += print_chars(padding, ' ');
-	count += print_chars(space, ' ');
-	count += print_chars(plus, '+');
 	return (count);
 }
 
diff --git a/test.c b/test.c
index 20fab53..5bdff1a 100644
--- a/test.c
+++ b/test.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/20 16:11:53 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/21 12:25:53 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/21 14:31:36 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,6 +17,6 @@
 int	main(void)
 {
 	printf("===\t-\t===\n\n");
-	printf("%d - ", printf("...%.0u...\n", 0));
-	printf("%d\n\n", ft_printf("...%.0u...\n", 0));
+	printf("%d - ", printf("...% d...\n", -1));
+	printf("%d\n\n", ft_printf("...% d...\n", -1));
 }