diff --git a/man/man1/INDEX b/man/man1/INDEX
index 218e539..e3ff2f1 100644
--- a/man/man1/INDEX
+++ b/man/man1/INDEX
@@ -34,6 +34,7 @@
 clog clog.1
 cmp cmp.1
 codereview codereview.1
+col col.1
 cmapcube colors.1
 colors colors.1
 comm comm.1
@@ -44,6 +45,7 @@
 db db.1
 stack db.1
 dc dc.1
+dd dd.1
 delatex deroff.1
 deroff deroff.1
 devdraw devdraw.1
@@ -63,6 +65,9 @@
 freq freq.1
 fsize fsize.1
 mtime fsize.1
+cvs git.1
+git git.1
+hg git.1
 grap grap.1
 graph graph.1
 g grep.1
@@ -75,8 +80,6 @@
 gzip gzip.1
 unzip gzip.1
 zip gzip.1
-cvs hg.1
-hg hg.1
 hget hget.1
 hist hist.1
 history hist.1
diff --git a/man/man1/awk.1 b/man/man1/awk.1
index df28f14..9a933b7 100644
--- a/man/man1/awk.1
+++ b/man/man1/awk.1
@@ -546,10 +546,10 @@
 To force an expression to be treated as a number add 0 to it;
 to force it to be treated as a string concatenate
 \&\fL""\fP to it.
-.br
+.PP
 The scope rules for variables in functions are a botch;
 the syntax is worse.
-.br
+.PP
 UTF is not always dealt with correctly,
 though
 .I awk
diff --git a/man/man1/col.1 b/man/man1/col.1
index 0d9513c..1cdcbcb 100644
--- a/man/man1/col.1
+++ b/man/man1/col.1
@@ -14,9 +14,9 @@
 as produced by
 .I nroff
 for .2C in
-.IR ms (6)
+.IR ms (7)
 or
-.IR man (6)
+.IR man (7)
 and for 
 .IR tbl (1).
 .I Col
diff --git a/man/man1/git.1 b/man/man1/git.1
index 19f2a10..b7e111f 100644
--- a/man/man1/git.1
+++ b/man/man1/git.1
@@ -1,4 +1,4 @@
-.TH HG 1
+.TH GIT 1
 .SH NAME 
 git, hg, cvs \- introduction to using plan9port Git repository
 .SH SYNOPSIS
diff --git a/man/man1/graph.1 b/man/man1/graph.1
index e82d312..bb6d25d 100644
--- a/man/man1/graph.1
+++ b/man/man1/graph.1
@@ -89,7 +89,7 @@
 Next argument is one or more of the characters
 .B bcgkmrwy,
 choosing pen colors by their initial letter, as in
-.IR plot (6).
+.IR plot (7).
 Successive curves will cycle through the colors in the given order.
 .TP
 .B  -s
diff --git a/man/man1/mount.1 b/man/man1/mount.1
index 4722a49..ec9f016 100644
--- a/man/man1/mount.1
+++ b/man/man1/mount.1
@@ -15,7 +15,7 @@
 is typically 
 either the name of a Unix domain socket
 (see
-.IR namespace (4))
+.IR namespace (1))
 or the name or IP address of a machine
 serving 9P over TCP port 564.
 .PP
diff --git a/man/man1/pic.1 b/man/man1/pic.1
index de443cc..0ee526f 100644
--- a/man/man1/pic.1
+++ b/man/man1/pic.1
@@ -12,7 +12,7 @@
 .if \\n($1>0 .sp .65
 ..
 .SH NAME
-pic, tpic \- troff and tex preprocessors for drawing pictures
+pic, tpic, svgpic \- troff and tex preprocessors for drawing pictures
 .SH SYNOPSIS
 .B pic
 [
diff --git a/man/man1/resample.1 b/man/man1/resample.1
index 8792246..f41d9e5 100755
--- a/man/man1/resample.1
+++ b/man/man1/resample.1
@@ -40,7 +40,7 @@
 .PP
 The input should be a Plan 9 image
 as described in 
-.IR image (6),
+.IR image (7),
 and the output will be a compressed 24-bit
 .B r8g8b8
 image.
@@ -53,6 +53,6 @@
 .B \*9/src/cmd/resample.c
 .SH "SEE ALSO
 .IR crop (1),
-.IR image (6)
+.IR image (7)
 .SH BUGS
 Faster algorithms exist, but this implementation produces correct pictures.
diff --git a/man/man3/INDEX b/man/man3/INDEX
index 9664f80..6654ea7 100644
--- a/man/man3/INDEX
+++ b/man/man3/INDEX
@@ -301,7 +301,6 @@
 ctime ctime.3
 gmtime ctime.3
 localtime ctime.3
-timezone ctime.3
 tm2sec ctime.3
 
 block_cipher des.3
@@ -1238,6 +1237,7 @@
 threadsetname thread.3
 threadsetstate thread.3
 threadspawn thread.3
+threadspawnd thread.3
 threadspawnl thread.3
 threadunpin thread.3
 threadwaitchan thread.3
@@ -1255,7 +1255,6 @@
 vtblockwrite venti-cache.3
 vtcachealloc venti-cache.3
 vtcacheallocblock venti-cache.3
-vtcacheblocksize venti-cache.3
 vtcachefree venti-cache.3
 vtcacheglobal venti-cache.3
 vtcachelocal venti-cache.3
diff --git a/man/man3/ctime.3 b/man/man3/ctime.3
index 65ab1d4..5491d39 100644
--- a/man/man3/ctime.3
+++ b/man/man3/ctime.3
@@ -1,6 +1,6 @@
 .TH CTIME 3
 .SH NAME
-ctime, localtime, gmtime, asctime, tm2sec, timezone \- convert date and time
+ctime, localtime, gmtime, asctime, tm2sec \- convert date and time
 .SH SYNOPSIS
 .B #include <u.h>
 .br
@@ -81,9 +81,9 @@
 is not
 .BR GMT .
 .SH SOURCE
-.B \*9/src/lib9/date.c
-.br
 .B \*9/src/lib9/ctime.c
+.br
+.B \*9/src/lib9/tm2sec.c
 .SH "SEE ALSO"
 .IR date (1),
 .IR time (3)
diff --git a/man/man3/getsnarf.3 b/man/man3/getsnarf.3
index 6c236e7..938aae3 100644
--- a/man/man3/getsnarf.3
+++ b/man/man3/getsnarf.3
@@ -34,18 +34,6 @@
 .I putsnarf
 will convert as necessary.
 .SH SOURCE
-.B \*9/src/libdraw/x11-itrans.c
+.B \*9/src/libdraw/snarf.c
 .SH SEE ALSO
 .IR snarfer (1)
-.SH BUGS
-On OS X, there are two snarf buffers: the Carbon snarf buffer
-used by native OS X applications, and the X11 snarf buffer,
-used by X11 applications.
-Whenever new text is written to the Carbon snarf buffer, the OS X X11
-implementation automatically copies that text to the X11 snarf buffer.
-The reverse is not done automatically, arguably a bug in the X11 server.
-To work around this,
-.I putsnarf
-writes to both the Carbon snarf buffer and the X11 snarf buffer.
-To work around this bug in remote or non-Plan 9 X11 clients, run
-.IR snarfer (1).
diff --git a/man/man3/mux.3 b/man/man3/mux.3
index caaf55f..0c429fb 100644
--- a/man/man3/mux.3
+++ b/man/man3/mux.3
@@ -146,7 +146,7 @@
 .I Libmux
 also provides a non-blocking interface, useful for programs forced
 to use a
-.IR select (2)-based
+.IR select (3)-based
 main loop.
 .I Muxrpcstart
 runs the first half of
diff --git a/man/man3/needstack.3 b/man/man3/needstack.3
index cf13809..071b891 100644
--- a/man/man3/needstack.3
+++ b/man/man3/needstack.3
@@ -50,9 +50,9 @@
 The X Window library implementation of
 .I XLookupString
 allocates some very large buffers on the stack, so
-.B \*9/src/libdraw/x11-itrans.c
+.B \*9/src/cmd/devdraw/x11-itrans.c
 calls
-.B needstack(20*1024)
+.B needstack(64*1024)
 before making calls to
 .IR XLookupString .
 If a thread (in this case, the keyboard-reading thread used
diff --git a/man/man3/wctl.3 b/man/man3/wctl.3
index 9addaeb..25c9023 100644
--- a/man/man3/wctl.3
+++ b/man/man3/wctl.3
@@ -34,6 +34,4 @@
 requests that the program's window be moved
 above all other windows and given the input focus.
 .SH SOURCE
-.B \*9/src/libdraw/x11-init.c
-.br
-.B \*9/src/libdraw/x11-wsys.c
+.B \*9/src/libdraw/wsys.c
diff --git a/man/man4/INDEX b/man/man4/INDEX
index 7b90c48..1965c3a 100644
--- a/man/man4/INDEX
+++ b/man/man4/INDEX
@@ -1,10 +1,14 @@
 0intro 0intro.4
 intro 0intro.4
+9import 9import.4
 9pfuse 9pfuse.4
 9pserve 9pserve.4
 acme acme.4
 factotum factotum.4
 fontsrv fontsrv.4
+flchk fossil.4
+flfmt fossil.4
+fossil fossil.4
 import import.4
 plumber plumber.4
 ramfs ramfs.4
diff --git a/man/man4/fontsrv.4 b/man/man4/fontsrv.4
index 7344cde..3fb0d66 100644
--- a/man/man4/fontsrv.4
+++ b/man/man4/fontsrv.4
@@ -130,4 +130,3 @@
 .B Times-Roman/14a/x0000.bit
 appears truncated on the right and
 too light overall.
-
diff --git a/man/man4/fossil.4 b/man/man4/fossil.4
index 6bb4a39..7c06f2f 100644
--- a/man/man4/fossil.4
+++ b/man/man4/fossil.4
@@ -486,7 +486,7 @@
 .I sed
 command to prepare the script.
 .SH SOURCE
-.B /sys/src/cmd/fossil
+.B \*9/src/cmd/fossil
 .SH SEE ALSO
 .IR yesterday (1),
 .IR fs (3),
diff --git a/man/man4/smugfs.4 b/man/man4/smugfs.4
index f05ccf4..4fb8c7f 100644
--- a/man/man4/smugfs.4
+++ b/man/man4/smugfs.4
@@ -264,7 +264,7 @@
 .PP
 If multiple categories or albums have the same name,
 only one will be accessible via the file system interface.
-Renaming the accessible one via 
+Renaming the accessible one via Unix's
 .IR mv (1)
 will resolve the problem.
 .PP
diff --git a/man/man4/tapefs.4 b/man/man4/tapefs.4
index 26f2afa..3297e2a 100644
--- a/man/man4/tapefs.4
+++ b/man/man4/tapefs.4
@@ -100,10 +100,10 @@
 and
 .I util.c
 in
-.BR /sys/src/cmd/tapefs ,
+.BR \*9/src/cmd/tapefs ,
 which in
 turn derive substantially from
 .IR ramfs (4).
 .SH "SEE ALSO
-.IR intro (5),
+.IR intro (7),
 .IR ramfs (4).
diff --git a/man/man7/htmlroff.7 b/man/man7/htmlroff.7
index 2e93a2d..e908c3f 100644
--- a/man/man7/htmlroff.7
+++ b/man/man7/htmlroff.7
@@ -2,7 +2,7 @@
 .SH NAME
 htmlroff \- HTML formatting and typesetting
 .SH DESCRIPTION
-.I Htmlroff (1)
+.IR Htmlroff (1)
 accepts 
 .I troff
 input with a few extensions and changes.
@@ -51,7 +51,7 @@
 \&.html td <td>Cell 2
 \&.html td
 \&.html t
-.EX
+.EE
 .LP
 produces this output:
 .IP
diff --git a/man/man7/mhtml.7 b/man/man7/mhtml.7
index 666eaad..dcf4986 100644
--- a/man/man7/mhtml.7
+++ b/man/man7/mhtml.7
@@ -22,7 +22,7 @@
 .IR htmlroff (1)
 macro definitions provides convenient macros for formatting HTML.
 It is usually used along with 
-.I troff (1)
+.IR troff (1)
 macro packages such as
 .IR man (7)
 and
@@ -75,7 +75,7 @@
 .B .PE
 with a PNG image corresponding to the output of
 running
-.I troff(1)
+.IR troff (1)
 on the input.
 .TP
 .B .TS\fR, \fP.TE
diff --git a/man/man8/INDEX b/man/man8/INDEX
index 13ced07..f122247 100644
--- a/man/man8/INDEX
+++ b/man/man8/INDEX
@@ -1,6 +1,9 @@
+fossilcons fossilcons.8
 getflags getflags.8
 usage getflags.8
 listen1 listen1.8
+mkext mkfs.8
+mkfs mkfs.8
 vbackup vbackup.8
 vcat vbackup.8
 vftp vbackup.8
diff --git a/man/man8/fossilcons.8 b/man/man8/fossilcons.8
index 163ee1a..b59b6b6 100644
--- a/man/man8/fossilcons.8
+++ b/man/man8/fossilcons.8
@@ -491,7 +491,7 @@
 the string used to represent this user in the 9P protocol
 .TP
 .I leader
-the group's leader (see
+the group's leader (see Plan 9's
 .IR stat (5)
 for a description of the special privileges held by a group leader)
 .TP
diff --git a/man/man8/getflags.8 b/man/man8/getflags.8
index 50274d4..86c295b 100644
--- a/man/man8/getflags.8
+++ b/man/man8/getflags.8
@@ -58,7 +58,7 @@
 .BR $0 ,
 the program name must be given explicitly on the command line.
 .SH EXAMPLE
-Parse the arguments for
+Parse the arguments for Plan 9's
 .IR leak (1):
 .IP
 .EX
diff --git a/man/man8/listen1.8 b/man/man8/listen1.8
index 0c4fc7a..534766b 100644
--- a/man/man8/listen1.8
+++ b/man/man8/listen1.8
@@ -1,4 +1,4 @@
-.TH LISTEN 8
+.TH LISTEN1 8
 .SH NAME
 listen1 \- listen for calls on a network device
 .SH SYNOPSIS
diff --git a/man/mkfile b/man/mkfile
index 8235445..a1ba97b 100644
--- a/man/mkfile
+++ b/man/mkfile
@@ -3,7 +3,7 @@
 indices:V:
 	for i in man*
 	do
-		rc ./secindex $i > $i/INDEX
+		9 rc ./secindex $i > $i/INDEX
 	done
 
 lookman.index:V: