diff --git a/scripts/broadcast-eigrp-discovery.nse b/scripts/broadcast-eigrp-discovery.nse
index 696dfdab5..a66d36c75 100644
--- a/scripts/broadcast-eigrp-discovery.nse
+++ b/scripts/broadcast-eigrp-discovery.nse
@@ -39,6 +39,7 @@ through all valid ethernet interfaces simultaneously.
 --
 -- @args broadcast-eigrp-discovery.kparams the K metrics. 
 -- Defaults to <code>101000</code>.
+-- @args broadcast-eigrp-discovery.interface Interface to send on (overrides -e)
 --
 --@output
 -- Pre-scan script results:
diff --git a/scripts/http-domino-enum-passwords.nse b/scripts/http-domino-enum-passwords.nse
index 495466e29..19065e3c2 100644
--- a/scripts/http-domino-enum-passwords.nse
+++ b/scripts/http-domino-enum-passwords.nse
@@ -77,6 +77,8 @@ also download any Domino ID Files attached to the Person document.
 --       If a negative value is given, all hashes and id files are retrieved (default: 10)
 -- @args domino-enum-passwords.idpath the path where downloaded ID files should be saved
 --       If not given, the script will only indicate if the ID file is donwloadable or not
+-- @args domino-enum-passwords.username Username for HTTP auth, if required
+-- @args domino-enum-passwords.password Password for HTTP auth, if required
 
 --
 -- Version 0.2
diff --git a/scripts/http-form-brute.nse b/scripts/http-form-brute.nse
index 1a75bb273..3c91a7d91 100644
--- a/scripts/http-form-brute.nse
+++ b/scripts/http-form-brute.nse
@@ -188,7 +188,6 @@ action = function( host, port )
 	local uservar = stdnse.get_script_args('http-form-brute.uservar')
 	local passvar = stdnse.get_script_args('http-form-brute.passvar')
   	local path = stdnse.get_script_args('http-form-brute.path') or "/"
-	local force = stdnse.get_script_args("http-form-brute.force")
 	local onsuccess = stdnse.get_script_args("http-form-brute.onsuccess")
 	local onfailure = stdnse.get_script_args("http-form-brute.onfailure")
 	
diff --git a/scripts/informix-query.nse b/scripts/informix-query.nse
index 1f5fded42..cd3a43494 100644
--- a/scripts/informix-query.nse
+++ b/scripts/informix-query.nse
@@ -31,6 +31,7 @@ authentication credentials (see also: informix-brute).
 --       (default: sysmaster)
 -- @args informix-query.query The query to run against the server
 --       (default: returns hostname and version)
+-- @args informix-query.instance The name of the instance to connect to
 
 -- Version 0.1
 
diff --git a/scripts/ms-sql-query.nse b/scripts/ms-sql-query.nse
index 4da1b3d08..91106e0d9 100644
--- a/scripts/ms-sql-query.nse
+++ b/scripts/ms-sql-query.nse
@@ -37,6 +37,7 @@ be disabled using the <code>mssql.scanned-ports-only</code> script argument.
 --
 -- @args ms-sql-query.query The query to run against the server.
 --       (default: SELECT @@version version)
+-- @args mssql.database Database to connect to (default: tempdb)
 --
 -- @output
 -- | ms-sql-query:  
@@ -69,6 +70,7 @@ local function process_instance( instance )
 	local status, result	
 	-- the tempdb should be a safe guess, anyway the library is set up
 	-- to continue even if the DB is not accessible to the user
+  -- TODO: consider renaming this arg to ms-sql-query.database
 	local database = stdnse.get_script_args( 'mssql.database' ) or "tempdb"
 	local query = stdnse.get_script_args( {'ms-sql-query.query', 'mssql-query.query' } ) or "SELECT @@version version"
 	local helper = mssql.Helper:new()
diff --git a/scripts/mysql-query.nse b/scripts/mysql-query.nse
index 670440a13..c03254a8c 100644
--- a/scripts/mysql-query.nse
+++ b/scripts/mysql-query.nse
@@ -24,9 +24,10 @@ Runs a query against a MySQL database and returns the results as a table.
 -- |   Query: SELECT host, user FROM mysql.user
 -- |_  User: root
 --
--- @args query the query for which to return the results
--- @args username (optional) the username used to authenticate to the database server
--- @args password (optional) the password used to authenticate to the database server
+-- @args mysql-query.query the query for which to return the results
+-- @args mysql-query.username (optional) the username used to authenticate to the database server
+-- @args mysql-query.password (optional) the password used to authenticate to the database server
+-- @args mysql-query.noheaders do not display column headers (default: false)
 --
 
 author = "Patrik Karlsson"
diff --git a/scripts/mysql-vuln-cve2012-2122.nse b/scripts/mysql-vuln-cve2012-2122.nse
index 444d3ba19..2477af763 100644
--- a/scripts/mysql-vuln-cve2012-2122.nse
+++ b/scripts/mysql-vuln-cve2012-2122.nse
@@ -65,6 +65,7 @@ Interesting post about this vuln:
 -- |_      http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2012-2122
 --
 -- @args mysql-vuln-cve2012-2122.user MySQL username. Default: root.
+-- @args mysql-vuln-cve2012-2122.pass MySQL password. Default: nmapFTW.
 -- @args mysql-vuln-cve2012-2122.iterations Connection retries. Default: 1500.
 -- @args mysql-vuln-cve2012-2122.socket_timeout Socket timeout (milliseconds). Default: 5000.
 ---
diff --git a/scripts/targets-ipv6-multicast-mld.nse b/scripts/targets-ipv6-multicast-mld.nse
index 097ce9cd2..354bb9e01 100644
--- a/scripts/targets-ipv6-multicast-mld.nse
+++ b/scripts/targets-ipv6-multicast-mld.nse
@@ -24,6 +24,7 @@ Attempts to discover available IPv6 hosts on the LAN by sending an MLD (multicas
 --
 -- @args targets-ipv6-multicast-mld.timeout timeout to wait for
 --       responses (default: 10s)
+-- @args targets-ipv6-multicast-mld.interface Interface to send on (overrides -e)
 --
 
 author = "niteesh"