diff --git a/ex01/src/main.cpp b/ex01/src/main.cpp
index 08f173f..3edc579 100644
--- a/ex01/src/main.cpp
+++ b/ex01/src/main.cpp
@@ -16,10 +16,10 @@ int calculate(std::stack<int>& nums, std::stack<char>& operators)
 		return 0;
 
 	int ret;
-	int a = nums.top();
-	nums.pop();
 	int b = nums.top();
 	nums.pop();
+	int a = nums.top();
+	nums.pop();
 	
 	switch (operators.top()) {
 		case '+':
@@ -60,17 +60,19 @@ int main(int ac, char** av)
 		if (std::isdigit(av[1][i]))
 			nums.push(av[1][i] - '0');
 		else if (std::strchr("/+-*", av[1][i]) != NULL)
+		{
 			operators.push(av[1][i]);
+			if (calculate(nums, operators))
+			{
+				std::cout << "error: division by 0" << std::endl;
+				return 1;
+			}
+		}
 		else
 		{
 			std::cout << "error: '" << av[1][i] << "' unknown char" << std::endl;
 			return 1;
 		}
-		if (calculate(nums, operators))
-		{
-			std::cout << "error: division by 0" << std::endl;
-			return 1;
-		}
 	}
 	if (nums.size() != 1)
 	{
@@ -79,7 +81,7 @@ int main(int ac, char** av)
 	}
 	if (operators.size() != 0)
 	{
-		std::cout << "error: too manu operators" << std::endl;
+		std::cout << "error: too many operators" << std::endl;
 		return 1;
 	}
 	std::cout << nums.top();