diff --git a/CHANGELOG b/CHANGELOG
index 7b530e30c..a391d563b 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -228,10 +228,14 @@ o In the interest of forward compatibility, the xmloutputversion
 
 o Zenmap no longer leaves any temporary files lying around. [David]
 
-o Nmap only prints an uptime guess in verbose mode now, because in some
-  situations it can be very inaccurate. See the discussion at
+o Nmap only prints an uptime guess in verbose mode now, because in
+  some situations it can be very inaccurate. See the discussion at
   http://seclists.org/nmap-dev/2008/q3/0392.html.
 
+o The higwidgets Python package used by Zenmap has been made a
+  subpackage of zenmapGUI. This is to avoid naming conflicts with
+  Umit, which uses a slightly different version of higwidgets. [David]
+
 Nmap 4.68 [2008-6-28]
 
 o Doug integrated all of your version detection submissions and
diff --git a/docs/nmap.usage.txt b/docs/nmap.usage.txt
index 2f55327cf..ac22883b0 100644
--- a/docs/nmap.usage.txt
+++ b/docs/nmap.usage.txt
@@ -63,6 +63,7 @@ TIMING AND PERFORMANCE:
   --host-timeout <time>: Give up on target after this long
   --scan-delay/--max-scan-delay <time>: Adjust delay between probes
   --min-rate <number>: Send packets no slower than <number> per second
+  --max-rate <number>: Send packets no faster than <number> per second
 FIREWALL/IDS EVASION AND SPOOFING:
   -f; --mtu <val>: fragment packets (optionally w/given MTU)
   -D <decoy1,decoy2[,ME],...>: Cloak a scan with decoys
diff --git a/scripts/script.db b/scripts/script.db
index fff6ee1b4..e92e54200 100644
--- a/scripts/script.db
+++ b/scripts/script.db
@@ -1,78 +1,84 @@
-Entry{ category = "default", filename = "dns-test-open-recursion.nse" }
-Entry{ category = "intrusive", filename = "dns-test-open-recursion.nse" }
+Entry{ category = "default", filename = "showOwner.nse" }
+Entry{ category = "safe", filename = "showOwner.nse" }
+Entry{ category = "demo", filename = "daytimeTest.nse" }
 Entry{ category = "default", filename = "RealVNC_auth_bypass.nse" }
 Entry{ category = "malware", filename = "RealVNC_auth_bypass.nse" }
 Entry{ category = "vuln", filename = "RealVNC_auth_bypass.nse" }
-Entry{ category = "default", filename = "showOwner.nse" }
-Entry{ category = "safe", filename = "showOwner.nse" }
-Entry{ category = "default", filename = "SSLv2-support.nse" }
-Entry{ category = "safe", filename = "SSLv2-support.nse" }
-Entry{ category = "malware", filename = "ircZombieTest.nse" }
-Entry{ category = "version", filename = "skype_v2-version.nse" }
-Entry{ category = "discovery", filename = "HTTPtrace.nse" }
-Entry{ category = "demo", filename = "echoTest.nse" }
-Entry{ category = "default", filename = "UPnP-info.nse" }
-Entry{ category = "safe", filename = "UPnP-info.nse" }
-Entry{ category = "default", filename = "rpcinfo.nse" }
-Entry{ category = "safe", filename = "rpcinfo.nse" }
-Entry{ category = "discovery", filename = "rpcinfo.nse" }
-Entry{ category = "auth", filename = "bruteTelnet.nse" }
-Entry{ category = "intrusive", filename = "bruteTelnet.nse" }
-Entry{ category = "default", filename = "SMTPcommands.nse" }
-Entry{ category = "discovery", filename = "SMTPcommands.nse" }
-Entry{ category = "safe", filename = "SMTPcommands.nse" }
-Entry{ category = "default", filename = "robots.nse" }
-Entry{ category = "safe", filename = "robots.nse" }
-Entry{ category = "default", filename = "zoneTrans.nse" }
-Entry{ category = "intrusive", filename = "zoneTrans.nse" }
-Entry{ category = "discovery", filename = "zoneTrans.nse" }
-Entry{ category = "discovery", filename = "ripeQuery.nse" }
-Entry{ category = "demo", filename = "chargenTest.nse" }
-Entry{ category = "malware", filename = "strangeSMTPport.nse" }
-Entry{ category = "version", filename = "iax2Detect.nse" }
-Entry{ category = "demo", filename = "showSMTPVersion.nse" }
-Entry{ category = "default", filename = "showHTMLTitle.nse" }
-Entry{ category = "demo", filename = "showHTMLTitle.nse" }
-Entry{ category = "safe", filename = "showHTMLTitle.nse" }
-Entry{ category = "discovery", filename = "promiscuous.nse" }
-Entry{ category = "version", filename = "netbios-smb-os-discovery.nse" }
-Entry{ category = "default", filename = "anonFTP.nse" }
-Entry{ category = "auth", filename = "anonFTP.nse" }
-Entry{ category = "intrusive", filename = "anonFTP.nse" }
 Entry{ category = "intrusive", filename = "SQLInject.nse" }
 Entry{ category = "vuln", filename = "SQLInject.nse" }
+Entry{ category = "auth", filename = "bruteTelnet.nse" }
+Entry{ category = "intrusive", filename = "bruteTelnet.nse" }
+Entry{ category = "discovery", filename = "HTTPtrace.nse" }
 Entry{ category = "demo", filename = "SMTP_openrelay_test.nse" }
-Entry{ category = "default", filename = "nbstat.nse" }
-Entry{ category = "discovery", filename = "nbstat.nse" }
-Entry{ category = "safe", filename = "nbstat.nse" }
-Entry{ category = "default", filename = "SNMPsysdesr.nse" }
-Entry{ category = "discovery", filename = "SNMPsysdesr.nse" }
-Entry{ category = "safe", filename = "SNMPsysdesr.nse" }
 Entry{ category = "default", filename = "HTTPAuth.nse" }
 Entry{ category = "auth", filename = "HTTPAuth.nse" }
 Entry{ category = "intrusive", filename = "HTTPAuth.nse" }
-Entry{ category = "default", filename = "finger.nse" }
-Entry{ category = "discovery", filename = "finger.nse" }
-Entry{ category = "demo", filename = "showHTTPVersion.nse" }
+Entry{ category = "default", filename = "dns-test-open-recursion.nse" }
+Entry{ category = "intrusive", filename = "dns-test-open-recursion.nse" }
+Entry{ category = "demo", filename = "chargenTest.nse" }
+Entry{ category = "default", filename = "showHTMLTitle.nse" }
+Entry{ category = "demo", filename = "showHTMLTitle.nse" }
+Entry{ category = "safe", filename = "showHTMLTitle.nse" }
+Entry{ category = "default", filename = "MSSQLm.nse" }
+Entry{ category = "discovery", filename = "MSSQLm.nse" }
+Entry{ category = "intrusive", filename = "MSSQLm.nse" }
+Entry{ category = "demo", filename = "echoTest.nse" }
 Entry{ category = "default", filename = "SSHv1-support.nse" }
 Entry{ category = "safe", filename = "SSHv1-support.nse" }
 Entry{ category = "default", filename = "MySQLinfo.nse" }
 Entry{ category = "discovery", filename = "MySQLinfo.nse" }
 Entry{ category = "safe", filename = "MySQLinfo.nse" }
-Entry{ category = "default", filename = "ftpbounce.nse" }
-Entry{ category = "intrusive", filename = "ftpbounce.nse" }
 Entry{ category = "auth", filename = "xamppDefaultPass.nse" }
 Entry{ category = "vuln", filename = "xamppDefaultPass.nse" }
-Entry{ category = "intrusive", filename = "HTTPpasswd.nse" }
-Entry{ category = "vuln", filename = "HTTPpasswd.nse" }
-Entry{ category = "demo", filename = "showSSHVersion.nse" }
-Entry{ category = "version", filename = "PPTPversion.nse" }
-Entry{ category = "default", filename = "ircServerInfo.nse" }
-Entry{ category = "discovery", filename = "ircServerInfo.nse" }
-Entry{ category = "default", filename = "MSSQLm.nse" }
-Entry{ category = "discovery", filename = "MSSQLm.nse" }
-Entry{ category = "intrusive", filename = "MSSQLm.nse" }
+Entry{ category = "default", filename = "SSLv2-support.nse" }
+Entry{ category = "safe", filename = "SSLv2-support.nse" }
+Entry{ category = "default", filename = "zoneTrans.nse" }
+Entry{ category = "intrusive", filename = "zoneTrans.nse" }
+Entry{ category = "discovery", filename = "zoneTrans.nse" }
+Entry{ category = "default", filename = "ftpbounce.nse" }
+Entry{ category = "intrusive", filename = "ftpbounce.nse" }
+Entry{ category = "version", filename = "skype_v2-version.nse" }
+Entry{ category = "discovery", filename = "promiscuous.nse" }
+Entry{ category = "default", filename = "SNMPsysdesr.nse" }
+Entry{ category = "discovery", filename = "SNMPsysdesr.nse" }
+Entry{ category = "safe", filename = "SNMPsysdesr.nse" }
+Entry{ category = "demo", filename = "showSMTPVersion.nse" }
+Entry{ category = "default", filename = "nbstat.nse" }
+Entry{ category = "discovery", filename = "nbstat.nse" }
+Entry{ category = "safe", filename = "nbstat.nse" }
+Entry{ category = "version", filename = "iax2Detect.nse" }
+Entry{ category = "default", filename = "rpcinfo.nse" }
+Entry{ category = "safe", filename = "rpcinfo.nse" }
+Entry{ category = "discovery", filename = "rpcinfo.nse" }
 Entry{ category = "default", filename = "HTTP_open_proxy.nse" }
 Entry{ category = "discovery", filename = "HTTP_open_proxy.nse" }
 Entry{ category = "intrusive", filename = "HTTP_open_proxy.nse" }
-Entry{ category = "demo", filename = "daytimeTest.nse" }
+Entry{ category = "intrusive", filename = "HTTPpasswd.nse" }
+Entry{ category = "vuln", filename = "HTTPpasswd.nse" }
+Entry{ category = "demo", filename = "showSSHVersion.nse" }
+Entry{ category = "default", filename = "SMTPcommands.nse" }
+Entry{ category = "discovery", filename = "SMTPcommands.nse" }
+Entry{ category = "safe", filename = "SMTPcommands.nse" }
+Entry{ category = "default", filename = "anonFTP.nse" }
+Entry{ category = "auth", filename = "anonFTP.nse" }
+Entry{ category = "intrusive", filename = "anonFTP.nse" }
+Entry{ category = "version", filename = "netbios-smb-os-discovery.nse" }
+Entry{ category = "default", filename = "robots.nse" }
+Entry{ category = "safe", filename = "robots.nse" }
+Entry{ category = "default", filename = "finger.nse" }
+Entry{ category = "discovery", filename = "finger.nse" }
+Entry{ category = "default", filename = "UPnP-info.nse" }
+Entry{ category = "safe", filename = "UPnP-info.nse" }
+Entry{ category = "malware", filename = "strangeSMTPport.nse" }
+Entry{ category = "default", filename = "ircServerInfo.nse" }
+Entry{ category = "discovery", filename = "ircServerInfo.nse" }
+Entry{ category = "malware", filename = "ircZombieTest.nse" }
+Entry{ category = "discovery", filename = "ripeQuery.nse" }
+Entry{ category = "demo", filename = "showHTTPVersion.nse" }
+Entry{ category = "version", filename = "PPTPversion.nse" }
+Entry{ category = "discovery", filename = "ASN.nse" }
+Entry{ category = "intrusive", filename = "brutePOP3.nse" }
+Entry{ category = "auth", filename = "brutePOP3.nse" }
+Entry{ category = "default", filename = "popcapa.nse" }
+Entry{ category = "intrusive", filename = "SNMPcommunitybrute.nse" }
+Entry{ category = "auth", filename = "SNMPcommunitybrute.nse" }