diff --git a/lib/msf/core/payload/osx/bundleinject.rb b/lib/msf/core/payload/osx/bundleinject.rb
index 21ddfb5d79..6bc4f40d30 100644
--- a/lib/msf/core/payload/osx/bundleinject.rb
+++ b/lib/msf/core/payload/osx/bundleinject.rb
@@ -17,7 +17,7 @@ module Payload::Osx::BundleInject
 			'Description'   => 'Inject a custom Mach-O bundle into the exploited process',
 			'Author'        => 
 				[
-					'Dino Dai Zovi <ddz@theta44.org>',
+					'ddz',
 				],
 			'License'       => MSF_LICENSE,
 			'Platform'      => 'osx',
diff --git a/modules/exploits/multi/browser/qtjava_pointer.rb b/modules/exploits/multi/browser/qtjava_pointer.rb
index 199ff2dbf3..bd11fc5f6e 100644
--- a/modules/exploits/multi/browser/qtjava_pointer.rb
+++ b/modules/exploits/multi/browser/qtjava_pointer.rb
@@ -33,7 +33,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			[
 				'hdm',           # Original exploit for Mac OS X PPC / Win32
 				'kf',            # Added support for Mac OS X X86
-				'ddz '           # Discovered bug, provided tips
+				'ddz'            # Discovered bug, provided tips
 			],
 			'Version'        => '$Revision$',
 			'References'     => 
diff --git a/modules/exploits/windows/browser/adobe_jbig2decode.rb b/modules/exploits/windows/browser/adobe_jbig2decode.rb
index 98fd9fb6c1..028f16ef16 100644
--- a/modules/exploits/windows/browser/adobe_jbig2decode.rb
+++ b/modules/exploits/windows/browser/adobe_jbig2decode.rb
@@ -25,7 +25,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					# Metasploit implementation
 					'natron', 
 					# bl4cksecurity blog explanation of vuln [see References]
-					'xort & redsand',
+					'xort', 'redsand',	
 					# obfuscation techniques and pdf template from util_printf
 					'MC', 'Didier Stevens <didier.stevens[at]gmail.com>', 
 			],
diff --git a/modules/exploits/windows/driver/broadcom_wifi_ssid.rb b/modules/exploits/windows/driver/broadcom_wifi_ssid.rb
index 07582fcfde..2e64520732 100644
--- a/modules/exploits/windows/driver/broadcom_wifi_ssid.rb
+++ b/modules/exploits/windows/driver/broadcom_wifi_ssid.rb
@@ -36,7 +36,7 @@ class Metasploit3 < Msf::Exploit::Remote
 			'Author'         => 
 				[
 					'Chris Eagle',	# initial discovery
-					'Johnny Cache <johnnycsh [at] 802.11mercenary.com>', # the man with the plan
+					'Johnny Cache <johnnycsh [at] 802.11mercenary.net>', # the man with the plan
 					'skape', # windows kernel ninjitsu and debugging
 					'hdm' # porting the C version to ruby
 				],
diff --git a/modules/exploits/windows/fileformat/adobe_jbig2decode.rb b/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
index 84ab66c9a9..5e958466ab 100644
--- a/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
+++ b/modules/exploits/windows/fileformat/adobe_jbig2decode.rb
@@ -25,7 +25,7 @@ class Metasploit3 < Msf::Exploit::Remote
 					# Metasploit implementation
 					'natron', 
 					# bl4cksecurity blog explanation of vuln [see References]
-					'xort & redsand',
+					'xort', 'redsand',				
 					# obfuscation techniques and pdf template from util_printf
 					'MC', 'Didier Stevens <didier.stevens[at]gmail.com>', 
 			], 
diff --git a/modules/exploits/windows/http/mailenable_auth_header.rb b/modules/exploits/windows/http/mailenable_auth_header.rb
index 9f394f0f37..74b6e3b2ab 100644
--- a/modules/exploits/windows/http/mailenable_auth_header.rb
+++ b/modules/exploits/windows/http/mailenable_auth_header.rb
@@ -26,7 +26,7 @@ class Metasploit3 < Msf::Exploit::Remote
 	header of the web request. MailEnable Enterprise Edition versions priot to 1.0.5 and
 	MailEnable Professional versions prior to 1.55 are affected.
 			},
-			'Author'         => 'David Maciejak <david dot maciejak at kyxar dot fr>',
+			'Author'         => 'David Maciejak <david.maciejak[at]kyxar.fr>',
 			'License'        => MSF_LICENSE,
 			'Version'        => '$Revision$',
 			'References'     =>
diff --git a/modules/exploits/windows/smb/ms05_039_pnp.rb b/modules/exploits/windows/smb/ms05_039_pnp.rb
index 060089e9b9..bf7ace7d3e 100644
--- a/modules/exploits/windows/smb/ms05_039_pnp.rb
+++ b/modules/exploits/windows/smb/ms05_039_pnp.rb
@@ -31,7 +31,7 @@ class Metasploit3 < Msf::Exploit::Remote
 				reboot. 
 					
 			},
-			'Author'         => [ 'hdm', 'bmc' ],
+			'Author'         => [ 'hdm', 'cazz' ],
 			'License'        => MSF_LICENSE,
 			'Version'        => '$Revision$',
 			'References'     =>