diff --git a/sources/commands/modes.cpp b/sources/commands/modes.cpp
index d5175e5..8e46b34 100644
--- a/sources/commands/modes.cpp
+++ b/sources/commands/modes.cpp
@@ -6,7 +6,7 @@
 /*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/24 17:29:48 by rparodi           #+#    #+#             */
-/*   Updated: 2025/06/19 14:02:08 by rparodi          ###   ########.fr       */
+/*   Updated: 2025/06/23 12:52:33 by rparodi          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
@@ -62,7 +62,7 @@ void Mode::checkMode() {
 			default :
 				break;
 		}
-		if ((this->_mode.back().first == CHAN_SET_KEY || this->_mode.back().first == CHAN_SET_LIMIT || this->_mode.back().first == CHAN_SET_OP) && argIndex < _args.size())
+		if ((tmp == CHAN_SET_KEY || tmp == CHAN_SET_LIMIT || tmp == CHAN_SET_OP) && argIndex < _args.size())
 			m.arguments = _args[argIndex++];
 		this->_mode.push_back(std::make_pair(tmp, m));
 	}
diff --git a/sources/core/check.cpp b/sources/core/check.cpp
index a35da1d..558d692 100644
--- a/sources/core/check.cpp
+++ b/sources/core/check.cpp
@@ -6,11 +6,12 @@
 /*   By: sben-tay <sben-tay@student.42.fr>          +#+  +:+       +#+        */
 /*                                                +#+#+#+#+#+   +#+           */
 /*   Created: 2025/05/13 11:25:04 by rparodi           #+#    #+#             */
-/*   Updated: 2025/06/21 18:49:43 by sben-tay         ###   ########.fr       */
+/*   Updated: 2025/06/23 12:44:32 by rparodi          ###   ########.fr       */
 /*                                                                            */
 /* ************************************************************************** */
 
 #include "core.hpp"
+#include "logs.hpp"
 #include <cerrno>
 #include <cstdlib>
 #include <iostream>
@@ -28,7 +29,7 @@ unsigned short int valid_port(char *input)
 	for (size_t i = 0; input[i]; i++) {
 		if (!isdigit(input[i])) {
 			if (DEBUG)
-				std::cerr << LOG << CLR_RED << "Error: Not only number in port: " << input << std::endl;
+				ERROR_MSG("Not only number in port: " << input);
 			return (0);
 		}
 	}
@@ -36,7 +37,7 @@ unsigned short int valid_port(char *input)
 	int port = strtol(input, NULL, 10);
 	if (errno == ERANGE) {
 		if (DEBUG)
-			std::cerr << LOG << CLR_RED << "Error: Port out of range: " << input << std::endl;
+			ERROR_MSG("Port out of range" << input);
 		return (0);
 	}
 	if (port < 1 || port > 65535)