diff --git a/scripts/banner.nse b/scripts/banner.nse
index 55b2a6cdd..512add1b8 100644
--- a/scripts/banner.nse
+++ b/scripts/banner.nse
@@ -12,7 +12,7 @@ increase in the level of verbosity requested on the command line.
 
 
 author = "jah <jah at zadkiel.plus.com>"
-license = "See Nmap License: http://nmap.org/book/man-legal.html"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery", "safe"}
 
 
diff --git a/scripts/db2-das-info.nse b/scripts/db2-das-info.nse
index 984defd70..efced4763 100644
--- a/scripts/db2-das-info.nse
+++ b/scripts/db2-das-info.nse
@@ -1,422 +1,422 @@
-description = [[
-Connects to the IBM DB2 Administration Server (DAS) on TCP or UDP port 523 and
-exports the server profile.  No authentication is required for this request.
-
-The script will also set the port product and version if a version scan is
-requested.
-]]
-
--- rev 1.1 (2010-01-28)
-
----
--- @output
--- PORT    STATE SERVICE VERSION
--- 523/tcp open  ibm-db2 IBM DB2 Database Server 9.07.0
--- | db2-das-info: DB2 Administration Server Settings
--- | ;DB2 Server Database Access Profile
--- | ;Use BINARY file transfer
--- | ;Comment lines start with a ";"
--- | ;Other lines must be one of the following two types:
--- | ;Type A: [section_name]
--- | ;Type B: keyword=value
--- |
--- | [File_Description]
--- | Application=DB2/LINUX 9.7.0
--- | Platform=18
--- | File_Content=DB2 Server Definitions
--- | File_Type=CommonServer
--- | File_Format_Version=1.0
--- | DB2System=MYBIGDATABASESERVER
--- | ServerType=DB2LINUX
--- |
--- | [adminst>dasusr1]
--- | NodeType=1
--- | DB2Comm=TCPIP
--- | Authentication=SERVER
--- | HostName=MYBIGDATABASESERVER
--- | PortNumber=523
--- | IpAddress=127.0.1.1
--- |
--- | [inst>db2inst1]
--- | NodeType=1
--- | DB2Comm=TCPIP
--- | Authentication=SERVER
--- | HostName=MYBIGDATABASESERVER
--- | ServiceName=db2c_db2inst1
--- | PortNumber=50000
--- | IpAddress=127.0.1.1
--- | QuietMode=No
--- | TMDatabase=1ST_CONN
--- |
--- | [db>db2inst1:TOOLSDB]
--- | DBAlias=TOOLSDB
--- | DBName=TOOLSDB
--- | Drive=/home/db2inst1
--- | Dir_entry_type=INDIRECT
--- |_Authentication=NOTSPEC
-
-author = "Patrik Karlsson, Tom Sellers"
-
-license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
-
-categories = {"safe", "discovery", "version"}
-
-require "stdnse"
-require "shortport"
-
---- Research Notes:
---
--- Little documentation on the protocol used to communicate with the IBM DB2 Admin Server 
--- service exists.  The packets and methods here were developed based on data captured
--- in the wild.  Interviews with knowledgeable individuals indicates that the following 
--- information can be used to recreate the traffic.
---
--- Requirements:
---   IBM DB2 Administrative Server (DAS) version >= 7.x instance, typically on port 523 tcp or udp
---   IBM DB2 Control Center (Java application, workings on Linux, Windows, etc)
---
--- Steps to reproduce:
---   Ensure network connectivity from test host to DB2 DAS instance on 523
---   In the Control Center, right click on All Systems and click Add
---   Enter the DB2 server IP or hostname in the System Name field and click OK
---   Start packet capture
---   Under All Systems right click on your DB2 server, choose export profile, enter file location, click OK
---   Stop packet capture
---
---   Details on how to reproduce these steps with the CLI are welcome.
-
-portrule = shortport.portnumber({523}, {"tcp","udp"}, {"open", "open|filtered"})
-
---- Extracts the server profile from an already parsed db2 packet
---
--- This function assumes that the data contains the server profile and does
--- no attempts to verify whether it does or not. The response from the function
--- is simply a substring starting at offset 37.
---
--- @param data string containing the "info" section as parsed by parse_db2_packet
--- @return string containing the complete server profile
-function extract_server_profile(data)
-	
-	local server_profile_offset = 37
-	
-	if server_profile_offset > data:len() then
-		return
-	end
-	
-	return data:sub(server_profile_offset)
-	
-end
-
---- Does *very* basic parsing of a DB2 packet
---
--- Due to the limited documentation of the protocol this function is guesswork
--- The section called info is essentialy the data part of the db2das data response
--- The length of this section is found at offset 158 in the db2das.data section 
---
---
--- @param packet table as returned from read_db2_packet
--- @return table with parsed data
-function parse_db2_packet(packet)
-
-	local info_length_offset = 158
-	local info_offset = 160
-	local version_offset = 97
-	local response = {}
-
-	if packet.header.data_len < info_length_offset then
-		stdnse.print_debug( "db2-das-info: packet too short to be DB2 response...")
-		return
-	end
-	
-	local _, len = bin.unpack(">S", packet.data:sub(info_length_offset, info_length_offset + 1))
-	_, response.version = bin.unpack("z", packet.data:sub(version_offset) )
-	response.info_length = len - 4
-	response.info = packet.data:sub(info_offset, info_offset + response.info_length - (info_offset-info_length_offset))
-	
-	if(nmap.debugging() > 3)  then
-		stdnse.print_debug( string.format("db2-das-info: version: %s", response.version) )
-		stdnse.print_debug( string.format("db2-das-info: info_length: %d", response.info_length) )
-		stdnse.print_debug( string.format("db2-das-info: response.info:len(): %d", response.info:len()))
-	end
-	
-	return response
-	
-end
-
---- Reads a DB2 packet from the socket
---
--- Due to the limited documentation of the protocol this function is guesswork
--- The first 41 bytes of the db2das response are considered to be the header
--- The bytes following the header are considered to be the data
---
--- Offset 38 of the header contains an integer with the length of the data section
--- The length of the data section can unfortunately be of either endianess
--- There's 
---
--- @param socket connected to the server
--- @return table with header and data
-function read_db2_packet(socket)
-	
-	local packet = {}
-	local header_len = 41
-	local total_len = 0
-	local buf
-	local endian
-
-	local DATA_LENGTH_OFFSET = 38
-	local ENDIANESS_OFFSET = 23
-
-	local catch = function()
-		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with DB2 server")
-		socket:close()
-	end
-	
-	local try = nmap.new_try(catch)
-	packet.header = {}
-
-	buf = try( socket:receive_bytes(header_len) )
-					
-	packet.header.raw = buf:sub(1, header_len)
-	
-	if packet.header.raw:sub(1, 10) == string.char(0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x32, 0x44, 0x41, 0x53) then
-	
-		stdnse.print_debug("db2-das-info: Got DB2DAS packet")
-
-		_, endian = bin.unpack( "A2", packet.header.raw, ENDIANESS_OFFSET )		
-
-		if endian == "9z" then
-			_, packet.header.data_len = bin.unpack("I", packet.header.raw, DATA_LENGTH_OFFSET )
-		else
-			_, packet.header.data_len = bin.unpack(">I", packet.header.raw, DATA_LENGTH_OFFSET )			
-		end
-		
-		total_len = header_len + packet.header.data_len
-		
-		if(nmap.debugging() > 3) then
-			stdnse.print_debug( string.format("db2-das-info: data_len: %d", packet.header.data_len) )
-			stdnse.print_debug( string.format("db2-das-info: buf_len: %d", buf:len()))
-			stdnse.print_debug( string.format("db2-das-info: total_len: %d", total_len))
-		end
-			
-		-- do we have all data as specified by data_len?
-		while total_len > buf:len() do
-			-- if not read additional bytes
-			if(nmap.debugging() > 3)  then
-				stdnse.print_debug( string.format("db2-das-info: Reading %d additional bytes", total_len - buf:len()))
-			end
-			local tmp = try( socket:receive_bytes( total_len - buf:len() ) )
-			if(nmap.debugging() > 3)  then
-				stdnse.print_debug( string.format("db2-das-info: Read %d bytes", tmp:len()))
-			end
-			buf = buf .. tmp
-		end
-		
-		packet.data = buf:sub(header_len + 1)
-					
-	else
-		stdnse.print_debug("db2-das-info: Unknown packet, aborting ...")
-		return
-	end
-		
-	return packet
-	
-end
-
---- Sends a db2 packet table over the wire
---
--- @param socket already connected to the server
--- @param packet table as returned from <code>create_das_packet</code>
---
-function send_db2_packet( socket, packet )
-
-	local catch = function()
-		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with DB2 server")
-		socket:close()
-	end
-
-	local try = nmap.new_try(catch)
-	
-	local buf = packet.header.raw .. packet.data
-
-	try( socket:send(buf) )
-
-end
-
---- Creates a db2 packet table using the magic byte and data
---
--- The function returns a db2 packet table:
--- packet.header - contains header specific values
--- packet.header.raw - contains the complete un-parsed header (string)
--- packet.header.data_len - contains the length of the data block
--- packet.data - contains the complete un-parsed data block (string)
---
--- @param magic byte containing a value of unknown function (could be type)
--- @param data string containing the db2 packet data
--- @return table as described above
---
-function create_das_packet( magic, data )
-	
-	local packet = {}
-	local data_len = data:len()
-	
-	packet.header = {}
-	
-	packet.header.raw = string.char(0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x32, 0x44, 0x41, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20)
-	packet.header.raw = packet.header.raw .. string.char(0x01, 0x04, 0x00, 0x00, 0x00, 0x10, 0x39, 0x7a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
-	packet.header.raw = packet.header.raw .. string.char(0x00, 0x00, 0x00, 0x00 ) 
-	packet.header.raw = packet.header.raw .. bin.pack("C", magic)
-	packet.header.raw = packet.header.raw .. bin.pack("S", data_len)
-	packet.header.raw = packet.header.raw .. string.char(0x00, 0x00)
-	
-	packet.header.data_len = data_len
-	packet.data = data
-	
-	return packet
-end
-
-action = function(host, port)
-	
-	
-	-- create the socket used for our connection
-	local socket = nmap.new_socket()
-	
-	-- set a reasonable timeout value
-	socket:set_timeout(10000)
-	
-	-- do some exception handling / cleanup
-	local catch = function()
-		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with " .. host.ip .. " on port " .. port.number)
-		socket:close()
-	end
-	
-	local try = nmap.new_try(catch)
-
-
-	try(socket:connect(host.ip, port.number, "tcp"))
-	
-	local query
-	
-	-- ************************************************************************************
-	-- Transaction block 1
-	-- ************************************************************************************
-	local data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x00)
-
-	--try(socket:send(query))
-	local db2packet = create_das_packet(0x02, data)
-	
-	send_db2_packet( socket, db2packet )
-	read_db2_packet( socket )
-	
-	-- ************************************************************************************
-	-- Transaction block 2
-	-- ************************************************************************************	
-	data = string.char(0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x08, 0x59, 0xe7, 0x1f, 0x4b, 0x79, 0xf0, 0x90, 0x72, 0x85, 0xe0, 0x8f)
-	data = data .. string.char(0x3e, 0x38, 0x45, 0x38, 0xe3, 0xe5, 0x12, 0xc4, 0x3b, 0xe9, 0x7d, 0xe2, 0xf5, 0xf0, 0x78, 0xcc)
-	data = data .. string.char(0x81, 0x6f, 0x87, 0x5f, 0x91)
-	
-	db2packet = create_das_packet(0x05, data)
-	
-	send_db2_packet( socket, db2packet )
-	read_db2_packet( socket )
-			
-	-- ************************************************************************************
-	-- Transaction block 3
-	-- ************************************************************************************
-	data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x01, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
-	data = data .. string.char(0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x00, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
-	data = data .. string.char(0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53, 0x72, 0x76, 0x00)
-
-	db2packet = create_das_packet(0x0a, data)
-	send_db2_packet( socket, db2packet )
-	read_db2_packet( socket )
-	
-	-- ************************************************************************************
-	-- Transaction block 4
-	-- ************************************************************************************
-	data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x01, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03)
-	data = data .. string.char(0x48, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xfb, 0x42, 0x90, 0x00, 0x00, 0x24, 0x93, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
-	data = data .. string.char(0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53, 0x72, 0x76, 0x00, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
-	data = data .. string.char(0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x00, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00)
-	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x00)
-	
-	db2packet = create_das_packet(0x06, data)
-	send_db2_packet( socket, db2packet )
-	
-	data = string.char( 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00)
-	data = data .. string.char(0x00, 0x04, 0xb8, 0x64, 0x62, 0x32, 0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73)
-	data = data .. string.char(0x63, 0x76, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00)
-	data = data .. string.char(0x00, 0x04, 0xb8, 0x64, 0x62, 0x32, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53)
-	data = data .. string.char(0x72, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x01, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00)
-	data = data .. string.char(0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x18)
-
-	db2packet = create_das_packet(0x06, data)
-	send_db2_packet( socket, db2packet )
-
-	local packet = read_db2_packet( socket )
-	local db2response = parse_db2_packet(packet)
-		
-	socket:close()
-	
-	-- The next block of code is essentially the version extraction code from db2-info.nse
-	if string.sub(db2response.version,1,3) == "SQL" then
-		local major_version = string.sub(db2response.version,4,5)
-
-		-- strip the leading 0 from the major version, for consistency with 
-		-- nmap-service-probes results
-		if string.sub(major_version,1,1) == "0" then
-			major_version = string.sub(major_version,2)
-		end
-		local minor_version = string.sub(db2response.version,6,7)
-		local hotfix = string.sub(db2response.version,8)
-		server_version = major_version .. "." .. minor_version .. "." .. hotfix
-	end
-	
-	-- Try to determine which of the two values (probe version vs script) has more 
-	-- precision.  A couple DB2 versions send DB2 UDB 7.1 vs SQL090204 (9.02.04)
-	local _
-	local current_count = 0
-	if port.version.version ~= nil then
-		_, current_count = string.gsub(port.version.version, "%.", "%.")
-	end	
-
-	local new_count = 0
-	if server_version ~= nil then
-		_, new_count = string.gsub(server_version, "%.", "%.")
-	end
-	
-	if current_count < new_count then
-		port.version.version = server_version
-	end
-	
-	if db2response.info then
-		result = "DB2 Administration Server Settings\r\n"
-		result = result .. extract_server_profile( db2response.info )		
-		
-		-- Set port information
-		port.version.name = "ibm-db2"
-		port.version.product = "IBM DB2 Database Server"
-		port.version.name_confidence = 100
-		nmap.set_port_version(host, port, "hardmatched")
-		nmap.set_port_state(host, port, "open")
-	end
-	
-	return result
-					
-end
+description = [[
+Connects to the IBM DB2 Administration Server (DAS) on TCP or UDP port 523 and
+exports the server profile.  No authentication is required for this request.
+
+The script will also set the port product and version if a version scan is
+requested.
+]]
+
+-- rev 1.1 (2010-01-28)
+
+---
+-- @output
+-- PORT    STATE SERVICE VERSION
+-- 523/tcp open  ibm-db2 IBM DB2 Database Server 9.07.0
+-- | db2-das-info: DB2 Administration Server Settings
+-- | ;DB2 Server Database Access Profile
+-- | ;Use BINARY file transfer
+-- | ;Comment lines start with a ";"
+-- | ;Other lines must be one of the following two types:
+-- | ;Type A: [section_name]
+-- | ;Type B: keyword=value
+-- |
+-- | [File_Description]
+-- | Application=DB2/LINUX 9.7.0
+-- | Platform=18
+-- | File_Content=DB2 Server Definitions
+-- | File_Type=CommonServer
+-- | File_Format_Version=1.0
+-- | DB2System=MYBIGDATABASESERVER
+-- | ServerType=DB2LINUX
+-- |
+-- | [adminst>dasusr1]
+-- | NodeType=1
+-- | DB2Comm=TCPIP
+-- | Authentication=SERVER
+-- | HostName=MYBIGDATABASESERVER
+-- | PortNumber=523
+-- | IpAddress=127.0.1.1
+-- |
+-- | [inst>db2inst1]
+-- | NodeType=1
+-- | DB2Comm=TCPIP
+-- | Authentication=SERVER
+-- | HostName=MYBIGDATABASESERVER
+-- | ServiceName=db2c_db2inst1
+-- | PortNumber=50000
+-- | IpAddress=127.0.1.1
+-- | QuietMode=No
+-- | TMDatabase=1ST_CONN
+-- |
+-- | [db>db2inst1:TOOLSDB]
+-- | DBAlias=TOOLSDB
+-- | DBName=TOOLSDB
+-- | Drive=/home/db2inst1
+-- | Dir_entry_type=INDIRECT
+-- |_Authentication=NOTSPEC
+
+author = "Patrik Karlsson, Tom Sellers"
+
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
+
+categories = {"safe", "discovery", "version"}
+
+require "stdnse"
+require "shortport"
+
+--- Research Notes:
+--
+-- Little documentation on the protocol used to communicate with the IBM DB2 Admin Server 
+-- service exists.  The packets and methods here were developed based on data captured
+-- in the wild.  Interviews with knowledgeable individuals indicates that the following 
+-- information can be used to recreate the traffic.
+--
+-- Requirements:
+--   IBM DB2 Administrative Server (DAS) version >= 7.x instance, typically on port 523 tcp or udp
+--   IBM DB2 Control Center (Java application, workings on Linux, Windows, etc)
+--
+-- Steps to reproduce:
+--   Ensure network connectivity from test host to DB2 DAS instance on 523
+--   In the Control Center, right click on All Systems and click Add
+--   Enter the DB2 server IP or hostname in the System Name field and click OK
+--   Start packet capture
+--   Under All Systems right click on your DB2 server, choose export profile, enter file location, click OK
+--   Stop packet capture
+--
+--   Details on how to reproduce these steps with the CLI are welcome.
+
+portrule = shortport.portnumber({523}, {"tcp","udp"}, {"open", "open|filtered"})
+
+--- Extracts the server profile from an already parsed db2 packet
+--
+-- This function assumes that the data contains the server profile and does
+-- no attempts to verify whether it does or not. The response from the function
+-- is simply a substring starting at offset 37.
+--
+-- @param data string containing the "info" section as parsed by parse_db2_packet
+-- @return string containing the complete server profile
+function extract_server_profile(data)
+	
+	local server_profile_offset = 37
+	
+	if server_profile_offset > data:len() then
+		return
+	end
+	
+	return data:sub(server_profile_offset)
+	
+end
+
+--- Does *very* basic parsing of a DB2 packet
+--
+-- Due to the limited documentation of the protocol this function is guesswork
+-- The section called info is essentialy the data part of the db2das data response
+-- The length of this section is found at offset 158 in the db2das.data section 
+--
+--
+-- @param packet table as returned from read_db2_packet
+-- @return table with parsed data
+function parse_db2_packet(packet)
+
+	local info_length_offset = 158
+	local info_offset = 160
+	local version_offset = 97
+	local response = {}
+
+	if packet.header.data_len < info_length_offset then
+		stdnse.print_debug( "db2-das-info: packet too short to be DB2 response...")
+		return
+	end
+	
+	local _, len = bin.unpack(">S", packet.data:sub(info_length_offset, info_length_offset + 1))
+	_, response.version = bin.unpack("z", packet.data:sub(version_offset) )
+	response.info_length = len - 4
+	response.info = packet.data:sub(info_offset, info_offset + response.info_length - (info_offset-info_length_offset))
+	
+	if(nmap.debugging() > 3)  then
+		stdnse.print_debug( string.format("db2-das-info: version: %s", response.version) )
+		stdnse.print_debug( string.format("db2-das-info: info_length: %d", response.info_length) )
+		stdnse.print_debug( string.format("db2-das-info: response.info:len(): %d", response.info:len()))
+	end
+	
+	return response
+	
+end
+
+--- Reads a DB2 packet from the socket
+--
+-- Due to the limited documentation of the protocol this function is guesswork
+-- The first 41 bytes of the db2das response are considered to be the header
+-- The bytes following the header are considered to be the data
+--
+-- Offset 38 of the header contains an integer with the length of the data section
+-- The length of the data section can unfortunately be of either endianess
+-- There's 
+--
+-- @param socket connected to the server
+-- @return table with header and data
+function read_db2_packet(socket)
+	
+	local packet = {}
+	local header_len = 41
+	local total_len = 0
+	local buf
+	local endian
+
+	local DATA_LENGTH_OFFSET = 38
+	local ENDIANESS_OFFSET = 23
+
+	local catch = function()
+		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with DB2 server")
+		socket:close()
+	end
+	
+	local try = nmap.new_try(catch)
+	packet.header = {}
+
+	buf = try( socket:receive_bytes(header_len) )
+					
+	packet.header.raw = buf:sub(1, header_len)
+	
+	if packet.header.raw:sub(1, 10) == string.char(0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x32, 0x44, 0x41, 0x53) then
+	
+		stdnse.print_debug("db2-das-info: Got DB2DAS packet")
+
+		_, endian = bin.unpack( "A2", packet.header.raw, ENDIANESS_OFFSET )		
+
+		if endian == "9z" then
+			_, packet.header.data_len = bin.unpack("I", packet.header.raw, DATA_LENGTH_OFFSET )
+		else
+			_, packet.header.data_len = bin.unpack(">I", packet.header.raw, DATA_LENGTH_OFFSET )			
+		end
+		
+		total_len = header_len + packet.header.data_len
+		
+		if(nmap.debugging() > 3) then
+			stdnse.print_debug( string.format("db2-das-info: data_len: %d", packet.header.data_len) )
+			stdnse.print_debug( string.format("db2-das-info: buf_len: %d", buf:len()))
+			stdnse.print_debug( string.format("db2-das-info: total_len: %d", total_len))
+		end
+			
+		-- do we have all data as specified by data_len?
+		while total_len > buf:len() do
+			-- if not read additional bytes
+			if(nmap.debugging() > 3)  then
+				stdnse.print_debug( string.format("db2-das-info: Reading %d additional bytes", total_len - buf:len()))
+			end
+			local tmp = try( socket:receive_bytes( total_len - buf:len() ) )
+			if(nmap.debugging() > 3)  then
+				stdnse.print_debug( string.format("db2-das-info: Read %d bytes", tmp:len()))
+			end
+			buf = buf .. tmp
+		end
+		
+		packet.data = buf:sub(header_len + 1)
+					
+	else
+		stdnse.print_debug("db2-das-info: Unknown packet, aborting ...")
+		return
+	end
+		
+	return packet
+	
+end
+
+--- Sends a db2 packet table over the wire
+--
+-- @param socket already connected to the server
+-- @param packet table as returned from <code>create_das_packet</code>
+--
+function send_db2_packet( socket, packet )
+
+	local catch = function()
+		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with DB2 server")
+		socket:close()
+	end
+
+	local try = nmap.new_try(catch)
+	
+	local buf = packet.header.raw .. packet.data
+
+	try( socket:send(buf) )
+
+end
+
+--- Creates a db2 packet table using the magic byte and data
+--
+-- The function returns a db2 packet table:
+-- packet.header - contains header specific values
+-- packet.header.raw - contains the complete un-parsed header (string)
+-- packet.header.data_len - contains the length of the data block
+-- packet.data - contains the complete un-parsed data block (string)
+--
+-- @param magic byte containing a value of unknown function (could be type)
+-- @param data string containing the db2 packet data
+-- @return table as described above
+--
+function create_das_packet( magic, data )
+	
+	local packet = {}
+	local data_len = data:len()
+	
+	packet.header = {}
+	
+	packet.header.raw = string.char(0x00, 0x00, 0x00, 0x00, 0x44, 0x42, 0x32, 0x44, 0x41, 0x53, 0x20, 0x20, 0x20, 0x20, 0x20, 0x20)
+	packet.header.raw = packet.header.raw .. string.char(0x01, 0x04, 0x00, 0x00, 0x00, 0x10, 0x39, 0x7a, 0x00, 0x05, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00)
+	packet.header.raw = packet.header.raw .. string.char(0x00, 0x00, 0x00, 0x00 ) 
+	packet.header.raw = packet.header.raw .. bin.pack("C", magic)
+	packet.header.raw = packet.header.raw .. bin.pack("S", data_len)
+	packet.header.raw = packet.header.raw .. string.char(0x00, 0x00)
+	
+	packet.header.data_len = data_len
+	packet.data = data
+	
+	return packet
+end
+
+action = function(host, port)
+	
+	
+	-- create the socket used for our connection
+	local socket = nmap.new_socket()
+	
+	-- set a reasonable timeout value
+	socket:set_timeout(10000)
+	
+	-- do some exception handling / cleanup
+	local catch = function()
+		stdnse.print_debug("%s", "db2-das-info: ERROR communicating with " .. host.ip .. " on port " .. port.number)
+		socket:close()
+	end
+	
+	local try = nmap.new_try(catch)
+
+
+	try(socket:connect(host.ip, port.number, "tcp"))
+	
+	local query
+	
+	-- ************************************************************************************
+	-- Transaction block 1
+	-- ************************************************************************************
+	local data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x00)
+
+	--try(socket:send(query))
+	local db2packet = create_das_packet(0x02, data)
+	
+	send_db2_packet( socket, db2packet )
+	read_db2_packet( socket )
+	
+	-- ************************************************************************************
+	-- Transaction block 2
+	-- ************************************************************************************	
+	data = string.char(0x00, 0x00, 0x00, 0x2c, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x08, 0x59, 0xe7, 0x1f, 0x4b, 0x79, 0xf0, 0x90, 0x72, 0x85, 0xe0, 0x8f)
+	data = data .. string.char(0x3e, 0x38, 0x45, 0x38, 0xe3, 0xe5, 0x12, 0xc4, 0x3b, 0xe9, 0x7d, 0xe2, 0xf5, 0xf0, 0x78, 0xcc)
+	data = data .. string.char(0x81, 0x6f, 0x87, 0x5f, 0x91)
+	
+	db2packet = create_das_packet(0x05, data)
+	
+	send_db2_packet( socket, db2packet )
+	read_db2_packet( socket )
+			
+	-- ************************************************************************************
+	-- Transaction block 3
+	-- ************************************************************************************
+	data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x01, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
+	data = data .. string.char(0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x00, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
+	data = data .. string.char(0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53, 0x72, 0x76, 0x00)
+
+	db2packet = create_das_packet(0x0a, data)
+	send_db2_packet( socket, db2packet )
+	read_db2_packet( socket )
+	
+	-- ************************************************************************************
+	-- Transaction block 4
+	-- ************************************************************************************
+	data = string.char(0x00, 0x00, 0x00, 0x0d, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4a, 0x01, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x03)
+	data = data .. string.char(0x48, 0x00, 0x00, 0x00, 0x00, 0x4a, 0xfb, 0x42, 0x90, 0x00, 0x00, 0x24, 0x93, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
+	data = data .. string.char(0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53, 0x72, 0x76, 0x00, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x64, 0x62, 0x32)
+	data = data .. string.char(0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x00, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x4c, 0xff, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x11, 0x00, 0x00, 0x00)
+	data = data .. string.char(0x0c, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x04, 0xb8, 0x00)
+	
+	db2packet = create_das_packet(0x06, data)
+	send_db2_packet( socket, db2packet )
+	
+	data = string.char( 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00)
+	data = data .. string.char(0x00, 0x04, 0xb8, 0x64, 0x62, 0x32, 0x64, 0x61, 0x73, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73)
+	data = data .. string.char(0x63, 0x76, 0x00, 0x00, 0x00, 0x00, 0x20, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x04, 0x00)
+	data = data .. string.char(0x00, 0x04, 0xb8, 0x64, 0x62, 0x32, 0x4b, 0x6e, 0x6f, 0x77, 0x6e, 0x44, 0x73, 0x63, 0x76, 0x53)
+	data = data .. string.char(0x72, 0x76, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x10, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x4c, 0x00, 0x00, 0x00, 0x01, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x08, 0x00, 0x00, 0x00, 0x0c, 0x00)
+	data = data .. string.char(0x00, 0x00, 0x0c, 0x00, 0x00, 0x00, 0x18)
+
+	db2packet = create_das_packet(0x06, data)
+	send_db2_packet( socket, db2packet )
+
+	local packet = read_db2_packet( socket )
+	local db2response = parse_db2_packet(packet)
+		
+	socket:close()
+	
+	-- The next block of code is essentially the version extraction code from db2-info.nse
+	if string.sub(db2response.version,1,3) == "SQL" then
+		local major_version = string.sub(db2response.version,4,5)
+
+		-- strip the leading 0 from the major version, for consistency with 
+		-- nmap-service-probes results
+		if string.sub(major_version,1,1) == "0" then
+			major_version = string.sub(major_version,2)
+		end
+		local minor_version = string.sub(db2response.version,6,7)
+		local hotfix = string.sub(db2response.version,8)
+		server_version = major_version .. "." .. minor_version .. "." .. hotfix
+	end
+	
+	-- Try to determine which of the two values (probe version vs script) has more 
+	-- precision.  A couple DB2 versions send DB2 UDB 7.1 vs SQL090204 (9.02.04)
+	local _
+	local current_count = 0
+	if port.version.version ~= nil then
+		_, current_count = string.gsub(port.version.version, "%.", "%.")
+	end	
+
+	local new_count = 0
+	if server_version ~= nil then
+		_, new_count = string.gsub(server_version, "%.", "%.")
+	end
+	
+	if current_count < new_count then
+		port.version.version = server_version
+	end
+	
+	if db2response.info then
+		result = "DB2 Administration Server Settings\r\n"
+		result = result .. extract_server_profile( db2response.info )		
+		
+		-- Set port information
+		port.version.name = "ibm-db2"
+		port.version.product = "IBM DB2 Database Server"
+		port.version.name_confidence = 100
+		nmap.set_port_version(host, port, "hardmatched")
+		nmap.set_port_state(host, port, "open")
+	end
+	
+	return result
+					
+end
diff --git a/scripts/dns-zone-transfer.nse b/scripts/dns-zone-transfer.nse
index 904110922..1189d4bfb 100644
--- a/scripts/dns-zone-transfer.nse
+++ b/scripts/dns-zone-transfer.nse
@@ -57,7 +57,7 @@ require('tab')
 require('dns')
 
 author = "Eddie Bell"
-license = 'Same as Nmap--See http://nmap.org/book/man-legal.html'
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {'default', 'intrusive', 'discovery'}
 
 portrule = shortport.portnumber(53, 'tcp') 
diff --git a/scripts/ftp-bounce.nse b/scripts/ftp-bounce.nse
index eb495e12b..36151aa14 100644
--- a/scripts/ftp-bounce.nse
+++ b/scripts/ftp-bounce.nse
@@ -2,7 +2,7 @@ description=[[
 Checks to see if an FTP server allows port scanning using the FTP bounce method.
 ]]
 author = "Marek Majkowski"
-license="Same as Nmap--See http://nmap.org/book/man-legal.html"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 
 ---
 -- @args ftp-bounce.username Username to login with instead of "anonymous"
diff --git a/scripts/telnet-brute.nse b/scripts/telnet-brute.nse
index e022ae5ef..1ebc7eeb3 100644
--- a/scripts/telnet-brute.nse
+++ b/scripts/telnet-brute.nse
@@ -4,8 +4,8 @@ Tries to get Telnet login credentials by guessing usernames and passwords.
 Update (Ron Bowes, November, 2009): Now uses unpwdb database. 
 ]]
 
-author = 'Eddie Bell, Ron Bowes'
-license = 'Same as Nmap--See http://nmap.org/book/man-legal.html'
+author = "Eddie Bell, Ron Bowes"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {'auth', 'intrusive'}
 
 ---
diff --git a/scripts/whois.nse b/scripts/whois.nse
index 9a5d2364c..d48df2f88 100644
--- a/scripts/whois.nse
+++ b/scripts/whois.nse
@@ -74,7 +74,7 @@ the RIRs.
 -- |_ country: US stateprov: CA
 
 author = "jah <jah at zadkiel.plus.com>"
-license = "See Nmap License: http://nmap.org/book/man-legal.html"
+license = "Same as Nmap--See http://nmap.org/book/man-legal.html"
 categories = {"discovery", "external", "safe"}
 
 local url    = require "url"