diff --git a/ft_calloc.c b/ft_calloc.c
index 4b7d609..530edfe 100644
--- a/ft_calloc.c
+++ b/ft_calloc.c
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/29 00:09:57 by apommier          #+#    #+#             */
-/*   Updated: 2020/11/29 17:03:36 by apommier         ###   ########.fr       */
+/*   Updated: 2020/12/13 20:21:40 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -14,10 +14,18 @@
 
 void	*ft_calloc(size_t nmemb, size_t size)
 {
-	void	*tab;
-
-	tab = malloc(size * nmemb);
-	if (tab == 0)
-		return (0);
-	return (tab);
+	void	*new;
+	int		i;
+	
+	i = 0;
+	new = malloc(size * nmemb);
+	if (new)
+	{
+		while (size * nmemb - i)
+		{
+			new[i] = 0;
+			i++;
+		}
+	}
+	return (new);
 }
diff --git a/ft_memcpy.c b/ft_memcpy.c
index c7a96a1..4ae901b 100644
--- a/ft_memcpy.c
+++ b/ft_memcpy.c
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/29 00:12:03 by apommier          #+#    #+#             */
-/*   Updated: 2020/12/12 12:38:43 by apommier         ###   ########.fr       */
+/*   Updated: 2020/12/13 19:59:15 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -21,8 +21,6 @@ void	*ft_memcpy(void *dest, const void *src, size_t n)
 	p = (char*)dest;
 	p1 = (const char*)src;
 
-	if (!dest || !src)
-		return (0);
 	i = 0;
 	while (i < n)
 	{
diff --git a/ft_memmove.c b/ft_memmove.c
index b602c38..d937bf4 100644
--- a/ft_memmove.c
+++ b/ft_memmove.c
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/29 00:12:14 by apommier          #+#    #+#             */
-/*   Updated: 2020/12/12 12:09:49 by apommier         ###   ########.fr       */
+/*   Updated: 2020/12/13 20:00:21 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -16,8 +16,6 @@ void	*ft_memmove(void *dest, const void *src, size_t n)
 {
 	size_t i;
 
-	if (!n || !dest || !src)
-		return (dest);
 	i = 0;
 	if (dest > src)
 	{
diff --git a/ft_strncmp.c b/ft_strncmp.c
index 3ed5fc0..eb0f5dd 100644
--- a/ft_strncmp.c
+++ b/ft_strncmp.c
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/29 00:13:31 by apommier          #+#    #+#             */
-/*   Updated: 2020/12/12 17:58:26 by apommier         ###   ########.fr       */
+/*   Updated: 2020/12/13 20:02:10 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -17,12 +17,10 @@ int	ft_strncmp(const char *s1, const char *s2, size_t n)
 	int i;
 
 	i = 0;
-	if (!s1 || !s2 || !n)
-		return (0);
 	while (n && s1[i] && s2[i])
 	{
 		if (s1[i] != s2[i])
-			return ((char)(s1[i] - s2[i]));
+			return ((unsigned char)s1[i] - (unsigned char)s2[i]);
 		n--;
 		i++;
 	}
diff --git a/ft_strnstr.c b/ft_strnstr.c
index dbe51b1..54880f5 100644
--- a/ft_strnstr.c
+++ b/ft_strnstr.c
@@ -6,7 +6,7 @@
 /*   By: apommier <apommier@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2020/11/29 00:13:42 by apommier          #+#    #+#             */
-/*   Updated: 2020/12/12 18:13:44 by apommier         ###   ########.fr       */
+/*   Updated: 2020/12/13 20:12:37 by apommier         ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -18,8 +18,8 @@ char	*ft_strnstr(const char *big, const char *little, size_t len)
 	int	j;
 
 	i = 0;
-	if (!len)
-		return (0);
+	if (!len || !little[i])
+		return (big);
 	if (!little[i])
 		return ((char*)big);
 	while (big[i] && len - i - 1)