diff --git a/CHANGELOG b/CHANGELOG
index 4b2e59e7f..c2947147d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,13 +3,14 @@
 4.20ALPHA5
 
 o Worked with Zhao to improve the new OS detection system with
-  better algorithms, some probe changes, and some bug fixes.  We're
+  better algorithms, probe changes, and bug fixes.  We're
   now ready to start growing the new database!  If Nmap gives you
   fingerprints, please submit them at the given URL.  The DB is still
-  extremely small.
+  extremely small.  The new system is extensively documented at
+  http://insecure.org/nmap/osdetect/ .
 
 o Nmap now supports IP options with the new --ip-options flag.  You
-  can specify any optiosn in hex, or use "R" (record route), "T"
+  can specify any options in hex, or use "R" (record route), "T"
   (record timestamp), "U") (record route & timestamp), "S [route]"
   (strict source route), or "L [route]" (loose source route).  Specify
   --packet-trace to display IP options of responses.  For further
diff --git a/FingerPrintResults.cc b/FingerPrintResults.cc
index 26490c002..3a7de3e4d 100644
--- a/FingerPrintResults.cc
+++ b/FingerPrintResults.cc
@@ -157,7 +157,7 @@ const char *FingerPrintResults::OmitSubmissionFP() {
   // can cause asymetric routing which leads to wrong TTL information.
   // They can cause variable timing too.
   if (distance > 10)
-    return "Host more than fifteen network hops away";
+    return "Host more than ten network hops away";
 
   if (maxTimingRatio > 1.4)
     return "maxTimingRatio is greater than 1.4";
diff --git a/docs/nmap.1 b/docs/nmap.1
index 34679cbff..2211a9ef7 100644
--- a/docs/nmap.1
+++ b/docs/nmap.1
@@ -2,7 +2,7 @@
 .\" It was generated using the DocBook XSL Stylesheets (version 1.69.1).
 .\" Instead of manually editing it, you probably should edit the DocBook XML
 .\" source for it and then use the DocBook XSL Stylesheets to regenerate it.
-.TH "NMAP" "1" "08/30/2006" "" "Nmap Reference Guide"
+.TH "NMAP" "1" "08/31/2006" "" "Nmap Reference Guide"
 .\" disable hyphenation
 .nh
 .\" disable justification (adjust text to left margin only)
@@ -91,6 +91,7 @@ This options summary is printed when Nmap is run with no arguments, and the late
 \fI\%http://insecure.org/nmap/data/nmap.usage.txt\fR. It helps people remember the most common options, but is no substitute for the in\-depth documentation in the rest of this manual. Some obscure options aren't even included here.
 .PP
 .nf
+Nmap 4.20ALPHA5 ( http://insecure.org/nmap/ )
 Usage: nmap [Scan Type(s)] [Options] {target specification}
 TARGET SPECIFICATION:
   Can pass hostnames, IP addresses, networks, etc.
@@ -128,7 +129,7 @@ SERVICE/VERSION DETECTION:
   \-\-version\-all: Try every single probe (intensity 9)
   \-\-version\-trace: Show detailed version scan activity (for debugging)
 OS DETECTION:
-  \-O: Enable OS detection (try 2nd generation, then 1st if that fails)
+  \-O: Enable OS detection (try 2nd generation w/fallback to 1st)
   \-O2: Only use the new OS detection system (no fallback)
   \-O1: Only use the old (1st generation) OS detection system
   \-\-osscan\-limit: Limit OS detection to promising targets
@@ -151,6 +152,7 @@ FIREWALL/IDS EVASION AND SPOOFING:
   \-e <iface>: Use specified interface
   \-g/\-\-source\-port <portnum>: Use given port number
   \-\-data\-length <num>: Append random data to sent packets
+  \-\-ip\-options <options>: Send packets with specified ip options
   \-\-ttl <val>: Set IP time\-to\-live field
   \-\-spoof\-mac <mac address/prefix/vendor name>: Spoof your MAC address
   \-\-badsum: Send packets with a bogus TCP/UDP checksum