diff --git a/modules/exploits/safari_launch_app/config.yaml b/modules/exploits/safari_launch_app/config.yaml
index 25840021b..ba9de7df2 100755
--- a/modules/exploits/safari_launch_app/config.yaml
+++ b/modules/exploits/safari_launch_app/config.yaml
@@ -19,7 +19,7 @@ beef:
             enable: true
             category: "Exploits"
             name: "Safari Launch App"
-            description: "Launch an application from the victim machine.<br/><br/>See CVE-2011-3230 for more details.<br /><br />Safari <= 5.1 on OS X is vulnerable. Original discovery by Aaron Sigel. Also see CVE-2011-3230"
+            description: "Launch an application from the victim machine.<br/><br/>See CVE-2011-3230 for more details.<br /><br />Safari <= 5.1 on OS X is vulnerable. Original discovery by Aaron Sigel."
             authors: ["antisnatchor"]
             target:
                 user_notify: ["S"]
diff --git a/modules/ipec/window_mail_client_dos/command.js b/modules/exploits/window_mail_client_dos/command.js
similarity index 100%
rename from modules/ipec/window_mail_client_dos/command.js
rename to modules/exploits/window_mail_client_dos/command.js
diff --git a/modules/ipec/window_mail_client_dos/config.yaml b/modules/exploits/window_mail_client_dos/config.yaml
similarity index 87%
rename from modules/ipec/window_mail_client_dos/config.yaml
rename to modules/exploits/window_mail_client_dos/config.yaml
index 8f1b007bc..891f16919 100644
--- a/modules/ipec/window_mail_client_dos/config.yaml
+++ b/modules/exploits/window_mail_client_dos/config.yaml
@@ -17,9 +17,9 @@ beef:
     module:
         windows_mail_client_dos:
             enable: true
-            category: "IPEC"
+            category: "Exploits"
             name: "Windows Mail Client DoS"
-            description: "This module exploits an unhandled exception in Windows Mail to crash the client remotely.<br /><br />Windows Mail is launched and then crashed if it is not already open. It comes installed by default on Windows Vista (but it's vulnerable also in Windows 7 SP2).<br /><br />The protocol handler used will be: nntp."
+            description: "This module exploits an unhandled exception in Windows Mail to crash the client remotely.<br /><br />Windows Mail is launched and then crashed if it is not already open. It comes installed by default on Windows Vista (but it's also vulnerable on Windows 7 SP2).<br /><br />The protocol handler used will be: nntp."
             authors: ["bcoles"]
             target:
                 user_notify: ["FF", "S"]
diff --git a/modules/ipec/window_mail_client_dos/module.rb b/modules/exploits/window_mail_client_dos/module.rb
similarity index 100%
rename from modules/ipec/window_mail_client_dos/module.rb
rename to modules/exploits/window_mail_client_dos/module.rb
diff --git a/modules/social_engineering/clippy/command.js b/modules/social_engineering/clippy/command.js
index ef8704e4b..eadc1d0f8 100755
--- a/modules/social_engineering/clippy/command.js
+++ b/modules/social_engineering/clippy/command.js
@@ -340,7 +340,7 @@ Clippy.prototype.hahaha = function() {
 		document.body.appendChild(div);
 		_c.openBubble("<%== @thankyoumessage %>");
 		setTimeout(function () { _c.killClippy(); }, 5000); 
-		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'result=user has accepted');
+		beef.net.send('<%= @command_url %>', <%= @command_id %>, 'answer=user has accepted');
 
 }
 Clippy.prototype.addHelp = function(_help, is_startphrase) {
diff --git a/modules/social_engineering/pretty_theft/module.rb b/modules/social_engineering/pretty_theft/module.rb
index 404925405..a816340c9 100644
--- a/modules/social_engineering/pretty_theft/module.rb
+++ b/modules/social_engineering/pretty_theft/module.rb
@@ -16,8 +16,10 @@
 class Pretty_theft < BeEF::Core::Command
   
   def self.options
+    configuration = BeEF::Core::Configuration.instance
+    logo_uri = "http://#{configuration.get("beef.http.host")}:#{configuration.get("beef.http.port")}/ui/media/images/beef.png"
     return [
-        {'name' =>'imgsauce', 'description' =>'Custom Logo', 'ui_label'=>'Custom Logo', 'value' => 'http://beefproject.com/images/logo.png'}
+        {'name' =>'imgsauce', 'description' =>'Custom Logo', 'ui_label'=>'Custom Logo', 'value' => logo_uri}
     ]
   end