diff --git a/nselib/smb.lua b/nselib/smb.lua
index 5a38f4b84..0b1f6c776 100644
--- a/nselib/smb.lua
+++ b/nselib/smb.lua
@@ -2,7 +2,7 @@
 --  sent to/from ports 139 or 445 of Windows systems, although it's also implemented by
 --  others (the most notable one being Samba). 
 --
--- The intention of this library is toe ventually handle all aspects of the SMB protocol,
+-- The intention of this library is to eventually handle all aspects of the SMB protocol,
 -- A programmer using this library must already have some knowledge of the SMB protocol, 
 -- although a lot isn't necessary. You can pick up a lot by looking at the code that uses
 -- this. The basic login is this:
diff --git a/scripts/script.db b/scripts/script.db
index de7297ce0..1670dcddc 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -89,10 +89,12 @@ Entry{ category = "external", filename = "whois.nse" }
 Entry{ category = "safe", filename = "whois.nse" }
 Entry{ category = "external", filename = "dns-safe-recursion-txid.nse" }
 Entry{ category = "intrusive", filename = "dns-safe-recursion-txid.nse" }
-Entry{ category = "version", filename = "smb-enum.nse" }
+Entry{ category = "discovery", filename = "smb-enum.nse" }
 Entry{ category = "intrusive", filename = "smb-enum.nse" }
 Entry{ category = "external", filename = "dns-safe-recursion-port.nse" }
 Entry{ category = "intrusive", filename = "dns-safe-recursion-port.nse" }
-Entry{ category = "version", filename = "smb-os-discovery.nse" }
 Entry{ category = "default", filename = "smb-os-discovery.nse" }
-Entry{ category = "version", filename = "smb-security-mode.nse" }
+Entry{ category = "discovery", filename = "smb-os-discovery.nse" }
+Entry{ category = "safe", filename = "smb-os-discovery.nse" }
+Entry{ category = "discovery", filename = "smb-security-mode.nse" }
+Entry{ category = "safe", filename = "smb-security-mode.nse" }
diff --git a/scripts/smb-enum.nse b/scripts/smb-enum.nse
index 0552ebb79..4acf51c2e 100644
--- a/scripts/smb-enum.nse
+++ b/scripts/smb-enum.nse
@@ -44,7 +44,7 @@ description = "Attempts to enumerate users and shares anonymously over SMB"
 author = "Ron Bowes"
 copyright = "Ron Bowes"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"version","intrusive"}
+categories = {"discovery", "intrusive"}
 
 require 'smb'
 
diff --git a/scripts/smb-os-discovery.nse b/scripts/smb-os-discovery.nse
index 8ba695d6c..4a5d7970f 100644
--- a/scripts/smb-os-discovery.nse
+++ b/scripts/smb-os-discovery.nse
@@ -17,7 +17,7 @@ id = "OS from SMB"
 description = "Attempts to determine the operating system over the SMB protocol (ports 445 and 139)."
 author = "Ron Bowes"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"version","default"}
+categories = {"default", "discovery", "safe"}
 
 require 'smb'
 require 'stdnse'
diff --git a/scripts/smb-security-mode.nse b/scripts/smb-security-mode.nse
index 83fddba3b..6fdbd43d8 100644
--- a/scripts/smb-security-mode.nse
+++ b/scripts/smb-security-mode.nse
@@ -32,8 +32,8 @@
 --  See nselib/smb.lua for more information on the protocol itself. 
 --
 --@usage
--- nmap --script smb-security-mide.nse -p445 127.0.0.1\n
--- sudo nmap -sU -sS --script smb-security-mide.nse -p U:137,T:139 127.0.0.1\n
+-- nmap --script smb-security-mode.nse -p445 127.0.0.1\n
+-- sudo nmap -sU -sS --script smb-security-mode.nse -p U:137,T:139 127.0.0.1\n
 --
 --@output
 -- |  SMB Security: User-level authentication
@@ -46,7 +46,7 @@ id = "SMB Security"
 description = "Attempts to determine the security mode over the SMB protocol (ports 445 and 139)."
 author = "Ron Bowes"
 license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-categories = {"version"}
+categories = {"discovery", "safe"}
 
 require 'smb'