diff --git a/Makefile b/Makefile
index 0e9849f..f020ce2 100644
--- a/Makefile
+++ b/Makefile
@@ -27,7 +27,7 @@ SRC			= ft_isalpha.c \
 			  ft_strchr.c \
 			  ft_strrchr.c \
 			  ft_strncmp.c \
-			  ft_memcpy.c \
+			  ft_memcmp.c \
 			  ft_memchr.c \
 			  ft_strnstr.c \
 			  ft_atoi.c \
diff --git a/ft_atoi.c b/ft_atoi.c
index 55fbfe1..964f855 100644
--- a/ft_atoi.c
+++ b/ft_atoi.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 19:07:51 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 19:17:34 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/05 20:53:10 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,9 +21,28 @@ int	ft_atoi(const char *nptr)
 	res = 0;
 	if (!nptr[0])
 		return (0);
-	if (nptr[0] == '-' && ft_isdigit(nptr[1]))
-		return (-1 * ft_atoi(nptr + 1));
-	while (ft_isdigit(nptr[i++]))
-		res = (10 * res) + (nptr[i] - '0');
+	while ((nptr[i] >= 9 && nptr[i] <= 13) || nptr[i] == ' ')
+		i++;
+	if (nptr[i] == '-' && ft_isdigit(nptr[i + 1]))
+		return (-1 * ft_atoi(&nptr[i] + 1));
+	else if (nptr[i] == '+' && ft_isdigit(nptr[i + 1]))
+		i++;
+	while (ft_isdigit(nptr[i]))
+	{
+		res = (10 * res) + nptr[i] - 48;
+		i++;
+	}
 	return (res);
 }
+/*
+#include <stdio.h>
+
+int	main(int argc, char **argv)
+{
+	if (argc > 1)
+	{
+		printf("%d\n", ft_atoi(argv[1]));
+		printf("%d\n", atoi(argv[1]));
+	}
+}
+*/
diff --git a/ft_calloc.c b/ft_calloc.c
index 58db4f2..bd9565c 100644
--- a/ft_calloc.c
+++ b/ft_calloc.c
@@ -6,13 +6,13 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 19:26:10 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 19:29:48 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/05 21:18:14 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-void	*calloc(size_t nmemb, size_t size)
+void	*ft_calloc(size_t nmemb, size_t size)
 {
 	void	*all_mem;
 
diff --git a/ft_isalpha.c b/ft_isalpha.c
index 4f9b5b6..587b604 100644
--- a/ft_isalpha.c
+++ b/ft_isalpha.c
@@ -6,13 +6,13 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 09:53:19 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 09:56:42 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 09:48:22 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 int	ft_isalpha(int c)
 {
-	if ((c > 'a' && c < 'z') || (c > 'A' && c < 'Z'))
+	if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'))
 		return (1);
 	return (0);
 }
diff --git a/ft_isdigit.c b/ft_isdigit.c
index 151571d..0b25ac9 100644
--- a/ft_isdigit.c
+++ b/ft_isdigit.c
@@ -6,13 +6,13 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 09:57:01 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 10:45:10 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/05 21:08:46 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 int	ft_isdigit(int c)
 {
-	if (c > '0' && c < '9')
+	if (c >= '0' && c <= '9')
 		return (1);
 	return (0);
 }
diff --git a/ft_isprint.c b/ft_isprint.c
index 9e0c39a..3b7d1cd 100644
--- a/ft_isprint.c
+++ b/ft_isprint.c
@@ -6,13 +6,13 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 11:14:13 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 11:16:46 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 10:04:03 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 int	ft_isprint(int c)
 {
-	if ((c >= 40 && c <= 126) || (c >= 7 && c <= 13))
+	if (c >= 32 && c <= 126)
 		return (1);
 	return (0);
 }
diff --git a/ft_memchr.c b/ft_memchr.c
index 03dc996..d4067a1 100644
--- a/ft_memchr.c
+++ b/ft_memchr.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 17:54:17 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:59:54 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 11:13:18 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,9 +14,9 @@
 
 void	*ft_memchr(const void *s, int c, size_t n)
 {
-	if (n > 0 && *((unsigned char *) s) == c)
-		return ((void *) s);
 	if (n <= 0)
 		return (NULL);
+	if (*(unsigned char *) s == (unsigned char) c)
+		return ((void *) s);
 	return (ft_memchr(s + 1, c, n - 1));
 }
diff --git a/ft_memcmp.c b/ft_memcmp.c
index 804eb20..027c1a4 100644
--- a/ft_memcmp.c
+++ b/ft_memcmp.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 18:00:38 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 18:05:28 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 11:17:32 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,9 @@ int	ft_memcmp(const void *s1, const void *s2, size_t n)
 {
 	if (n <= 0)
 		return (0);
-	if (*((unsigned char *) s1) != *((unsigned char *) s2))
-		return (*((unsigned char *) s1) - *((unsigned char *) s2));
+	if (*(unsigned char *) s1 > *(unsigned char *) s2)
+		return (1);
+	if (*(unsigned char *) s1 < *(unsigned char *) s2)
+		return (-1);
 	return (ft_memcmp(s1 + 1, s2 + 1, n - 1));
 }
diff --git a/ft_memmove.c b/ft_memmove.c
index 98ab7bd..1eb4a0b 100644
--- a/ft_memmove.c
+++ b/ft_memmove.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 13:17:42 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 13:27:43 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 12:01:28 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -19,7 +19,7 @@ void	*ft_rev_memcpy(void *dest, const void *src, size_t n)
 		return (dest);
 	}
 	*((char *) dest) = *((char *) src);
-	ft_memcpy(dest - 1, src - 1, n - 1);
+	ft_rev_memcpy(dest - 1, src - 1, n - 1);
 	return (dest);
 }
 
@@ -28,6 +28,6 @@ void	*ft_memmove(void *dest, const void *src, size_t n)
 	if (dest < src)
 		ft_memcpy(dest, src, n);
 	else
-		ft_rev_memcpy(dest + n, src + n, n);
+		ft_rev_memcpy(dest + (n - 1), src + (n - 1), n);
 	return (dest);
 }
diff --git a/ft_strchr.c b/ft_strchr.c
index 1d817b6..f95bdbb 100644
--- a/ft_strchr.c
+++ b/ft_strchr.c
@@ -6,15 +6,15 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 17:24:37 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:38:39 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 12:38:20 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 char	*ft_strchr(const char *s, int c)
 {
-	if (*s == c)
+	if ((unsigned char) s[0] == (unsigned char) c)
 		return ((char *) s);
-	if (!(*s))
+	if (!s[0])
 		return (0);
 	return (ft_strchr(s + 1, c));
 }
diff --git a/ft_strdup.c b/ft_strdup.c
index 9c789e8..44edb8b 100644
--- a/ft_strdup.c
+++ b/ft_strdup.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 19:31:29 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 19:35:13 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 10:07:22 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,8 +21,11 @@ char	*ft_strdup(const char *s)
 	if (!dest)
 		return (NULL);
 	i = 0;
-	while (s[i++])
+	while (s[i])
+	{
 		dest[i] = s[i];
+		i++;
+	}
 	dest[i] = '\0';
 	return (dest);
 }
diff --git a/ft_strlcat.c b/ft_strlcat.c
index 9fc426e..302c44e 100644
--- a/ft_strlcat.c
+++ b/ft_strlcat.c
@@ -6,21 +6,28 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 17:11:43 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:19:16 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 12:26:04 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "libft.h"
 
-size_t	ft_strlcpy(char *dst, const char *src, size_t size)
+size_t	ft_strlcat(char *dst, const char *src, size_t size)
 {
 	size_t	i;
 	size_t	j;
 
 	i = 0;
 	j = ft_strlen(dst);
-	while (i < (size - 1) && src[i++])
+	if (!size)
+		return (ft_strlen(src));
+	if (j >= size)
+		return (ft_strlen(src) + size);
+	while (src[i] && i < ((size - j) - 1))
+	{
 		dst[i + j] = src[i];
+		i++;
+	}
 	dst[i + j] = '\0';
-	return (j + ft_strlen(dst));
+	return (j + ft_strlen(src));
 }
diff --git a/ft_strlcpy.c b/ft_strlcpy.c
index ed60ea6..6ca059b 100644
--- a/ft_strlcpy.c
+++ b/ft_strlcpy.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 13:31:13 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:10:52 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 12:05:04 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,8 +17,14 @@ size_t	ft_strlcpy(char *dst, const char *src, size_t size)
 	size_t	i;
 
 	i = 0;
-	while (src[i++] && size > (i - 1))
-		dst[i] = src[i];
-	dst[i] = '\0';
+	if (size > 0)
+	{
+		while (src[i] && i < (size - 1))
+		{
+			dst[i] = src[i];
+			i++;
+		}
+		dst[i] = '\0';
+	}
 	return (ft_strlen(src));
 }
diff --git a/ft_strncmp.c b/ft_strncmp.c
index 5428d76..51cb6a7 100644
--- a/ft_strncmp.c
+++ b/ft_strncmp.c
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 17:34:15 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:41:35 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 11:08:43 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,7 +16,19 @@ int	ft_strncmp(const char *s1, const char *s2, size_t n)
 {
 	if (n <= 0)
 		return (0);
-	if (*s1 != *s2)
-		return (*s1 - *s2);
+	if (!(*s1) && !(*s2))
+		return (0);
+	if (*(unsigned char *) s1 > *(unsigned char *) s2)
+		return (1);
+	if (*(unsigned char *) s1 < *(unsigned char *) s2)
+		return (-1);
 	return (ft_strncmp(s1 + 1, s2 + 1, n - 1));
 }
+/*
+#include "stdio.h"
+
+int	main(void)
+{
+	printf("%d\n", ft_strncmp("test\200", "test\0", 6));
+}
+*/
diff --git a/ft_strnstr.c b/ft_strnstr.c
index 738ec32..fb528c6 100644
--- a/ft_strnstr.c
+++ b/ft_strnstr.c
@@ -1,12 +1,12 @@
 /* ************************************************************************** */
 /*                                                                            */
 /*                                                        :::      ::::::::   */
-/*   strnstr.c                                          :+:      :+:    :+:   */
+/*   ft_strnstr.c                                       :+:      :+:    :+:   */
 /*                                                    +:+ +:+         +:+     */
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 18:05:52 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 19:07:15 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 13:18:50 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -15,13 +15,15 @@
 char	*ft_strnstr(const char *big, const char *little, size_t len)
 {
 	size_t	little_len;
+	size_t	big_len;
 	size_t	i;
 
 	i = 0;
 	little_len = ft_strlen(little);
+	big_len = ft_strlen(big);
 	if (!little[0])
 		return ((char *) big);
-	while ((len - i) < little_len)
+	while ((little_len + i) <= len && (little_len + i) <= big_len)
 	{
 		if (!ft_strncmp(&big[i], little, little_len))
 			return ((char *) &big[i]);
@@ -29,3 +31,9 @@ char	*ft_strnstr(const char *big, const char *little, size_t len)
 	}
 	return (NULL);
 }
+/*
+int	main(void)
+{
+	ft_strnstr("lorem ipsum dolor sit amet", "lorem", 15);
+}
+*/
diff --git a/ft_strrchr.c b/ft_strrchr.c
index 0ec6855..0a009f3 100644
--- a/ft_strrchr.c
+++ b/ft_strrchr.c
@@ -6,10 +6,12 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 17:28:39 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 17:33:38 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/06 12:39:21 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
+#include "libft.h"
+
 char	*ft_strrchr(const char *s, int c)
 {
 	int	i;
@@ -19,9 +21,17 @@ char	*ft_strrchr(const char *s, int c)
 		i++;
 	while (i >= 0)
 	{
-		if (s[i] == c)
+		if ((unsigned char) s[i] == (unsigned char) c)
 			return ((char *) &s[i]);
-		i++;
+		i--;
 	}
-	return (0);
+	return (NULL);
 }
+/*
+#include <stdio.h>
+
+int	main(void)
+{
+	printf("%s\n", ft_strrchr("bonjour", 'b'));
+}
+*/
diff --git a/libft.h b/libft.h
index 9a53618..020d9bf 100644
--- a/libft.h
+++ b/libft.h
@@ -6,7 +6,7 @@
 /*   By: dgaillet <dgaillet@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/11/05 09:49:43 by dgaillet          #+#    #+#             */
-/*   Updated: 2025/11/05 19:36:02 by dgaillet         ###   ########lyon.fr   */
+/*   Updated: 2025/11/05 21:10:02 by dgaillet         ###   ########lyon.fr   */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -36,7 +36,7 @@ int		ft_memcmp(const void *s1, const void *s2, size_t n);
 void	*ft_memchr(const void *s, int c, size_t n);
 char	*ft_strnstr(const char *big, const char *little, size_t len);
 int		ft_atoi(const char *nptr);
-void	*calloc(size_t nmemb, size_t size);
+void	*ft_calloc(size_t nmemb, size_t size);
 char	*ft_strdup(const char *s);
 
 #endif