diff --git a/app/punishermodule.cpp b/app/punishermodule.cpp
index 24091b9..f991164 100644
--- a/app/punishermodule.cpp
+++ b/app/punishermodule.cpp
@@ -32,7 +32,7 @@ bool PunisherModule::messageHandler(Message msg)
                 }
             }
             if(found)
-                answer += privateSay(QString("removed %1 to the list of forbidden words").arg(str[i]), target);
+                answer += privateSay(QString("removed %1 from the list of forbidden words").arg(str[i]), target);
             else
                 answer += privateSay(QString("%1 was not part of the list of forbidden words").arg(str[i]), target);
             
@@ -57,7 +57,7 @@ bool PunisherModule::messageHandler(Message msg)
         for(; i<str.size(); ++i)
         {
             forbidden_words.push_back(str[i]);
-            answer += privateSay(QString("added %1 from the list of forbidden words").arg(str[i]), target);
+            answer += privateSay(QString("added %1 to the list of forbidden words").arg(str[i]), target);
         }
         if(i==2)
             answer = privateSay(QString("missing argument"), target);
@@ -75,6 +75,8 @@ bool PunisherModule::messageHandler(Message msg)
     
     if(msg.nick.compare("LadySparrow") == 0)
         return false;
+    if(msg.command.compare("PRIVMSG", Qt::CaseInsensitive) != 0)
+        return false;
     
     for(const QString &w : forbidden_words)
     {