diff --git a/scripts/SNMPsysdesr.nse b/scripts/SNMPsysdesr.nse
index f20bdf299..746765f22 100644
--- a/scripts/SNMPsysdesr.nse
+++ b/scripts/SNMPsysdesr.nse
@@ -1,5 +1,7 @@
--- SNMP system detection script
--- rev 0.4 (6-11-2007)
+--- SNMP version 1 system information gathering script
+-- @output
+-- |  SNMPv1: HP ETHERNET MULTI-ENVIRONMENT,ROM A.25.80,JETDIRECT,JD117,EEPROM V.28.22,CIDATE 08/09/2006 \n
+-- |_   System uptime: 28 days, 17:18:59 (248153900 timeticks)
 
 id = "SNMPv1"
 
@@ -17,8 +19,13 @@ require "snmp"
 -- runs after SNMPcommunityprobe.nse
 runlevel = 2
 
+---
+-- Runs on UDP port 161
 portrule = shortport.portnumber(161, "udp", {"open", "open|filtered"})
 
+
+---
+-- Sends SNMP packets to host and reads responses
 action = function(host, port)
 
        	-- create the socket used for our connection
@@ -54,11 +61,7 @@ action = function(host, port)
 	-- read in any response we might get
 	status, response = socket:receive_bytes(1)
 
-	if (not status) then
-		return
-	end
-
-	if (response == "TIMEOUT") then
+	if (not status) or (response == "TIMEOUT") then 
 		return
 	end
 	
@@ -80,11 +83,7 @@ action = function(host, port)
 	-- read in any response we might get
 	status, response = socket:receive_bytes(1)
 
-	if (not status) then
-		return result
-	end
-
-	if (response == "TIMEOUT") then
+	if (not status) or (response == "TIMEOUT") then
 		return result
 	end
 	
diff --git a/scripts/UPnP-info.nse b/scripts/UPnP-info.nse
index f21de3602..03c5c7de0 100644
--- a/scripts/UPnP-info.nse
+++ b/scripts/UPnP-info.nse
@@ -1,5 +1,7 @@
--- UPnP network information script
--- rev 0.2 (1-9-2007)
+--- UPnP network service information gathering script
+-- @output
+-- |  UPnP:  System/1.0 UPnP/1.0 IGD/1.0 \n
+-- |_ Location: http://192.168.1.1:80/UPnP/IGD.xml
 
 id = "UPnP"
 
@@ -14,9 +16,14 @@ categories = {"default", "safe"}
 require("stdnse")
 require("shortport")
 require("strbuf")
-
+
+---
+-- Runs on UDP port 1900
 portrule = shortport.portnumber(1900, "udp", {"open", "open|filtered"})
-
+
+---
+-- Sends UPnP discovery packet to host, 
+-- and extracts service information from results
 action = function(host, port)
 	
 	-- create the socket used for our connection