diff --git a/appl/ftp/ftp/ftp.1 b/appl/ftp/ftp/ftp.1
index 6a0f311c4..9534d9ecb 100644
--- a/appl/ftp/ftp/ftp.1
+++ b/appl/ftp/ftp/ftp.1
@@ -916,7 +916,7 @@ if verbose is on, when a file transfer completes, statistics
 regarding the efficiency of the transfer are reported.
 By default,
 verbose is on.
-.It Ic ? Op Ar command
+.It Ic \&? Op Ar command
 A synonym for help.
 .El
 .Pp
diff --git a/appl/ftp/ftpd/ftpd.8 b/appl/ftp/ftpd/ftpd.8
index 7b4c85c0a..872a7b877 100644
--- a/appl/ftp/ftpd/ftpd.8
+++ b/appl/ftp/ftpd/ftpd.8
@@ -81,7 +81,7 @@ but only OTP is allowed.
 .It Ar ftp
 Allow anonymous login.
 .El
-
+.Pp
 The following combination modes exists for backwards compatibility:
 .Bl -tag -width plain
 .It Ar none
@@ -319,7 +319,7 @@ that the
 .Dq ftp
 subtree be constructed with care, consider following these guidelines
 for anonymous ftp.
-
+.Pp
 In general all files should be owned by
 .Dq root ,
 and have non-write permissions (644 or 755 depending on the kind of
@@ -377,7 +377,7 @@ and
 .Xr group 5
 files here, ls will be able to produce owner names rather than
 numbers. Remember to remove any passwords from these files.  
-
+.Pp
 The file
 .Pa motd ,
 if present, will be printed after a successful login.
@@ -388,7 +388,7 @@ here.
 .It Pa ~ftp/pub
 Traditional place to put whatever you want to make public.
 .El
-
+.Pp
 If you want guests to be able to upload files, create a
 .Pa ~ftp/incoming
 directory owned by 
diff --git a/appl/ftp/ftpd/ftpusers.5 b/appl/ftp/ftpd/ftpusers.5
index 549ff5b80..607e50f6b 100644
--- a/appl/ftp/ftpd/ftpusers.5
+++ b/appl/ftp/ftpd/ftpusers.5
@@ -20,7 +20,7 @@ matches any user.  Users that has an explicit
 .Dq allow ,
 or that does not match any line, are allowed access. Anyone else is
 denied access.
-
+.Pp
 Note that this is compatible with the old format, where this file
 contained a list of users that should be denied access.
 .Sh EXAMPLES
diff --git a/appl/kx/kxd.8 b/appl/kx/kxd.8
index 6d6b45c1a..75e260bbb 100644
--- a/appl/kx/kxd.8
+++ b/appl/kx/kxd.8
@@ -41,7 +41,6 @@ Port.  Listen on the port
 Only usable with
 .Fl i .
 .El
-
 .Sh EXAMPLES
 Put the following in
 .Pa /etc/inetd.conf :
diff --git a/appl/kx/rxtelnet.1 b/appl/kx/rxtelnet.1
index d52817259..334b4ebf4 100644
--- a/appl/kx/rxtelnet.1
+++ b/appl/kx/rxtelnet.1
@@ -10,7 +10,7 @@ start a telnet and forward X-connections.
 .Sh SYNOPSIS
 .Nm rxtelnet
 .Op Fl l Ar username
-.Op Fl k	
+.Op Fl k
 .Op Fl t Ar telnet_args
 .Op Fl x Ar xterm_args
 .Op Fl w Ar term_emulator
diff --git a/appl/otp/otpprint.1 b/appl/otp/otpprint.1
index 011abf282..4194c4c00 100644
--- a/appl/otp/otpprint.1
+++ b/appl/otp/otpprint.1
@@ -39,6 +39,7 @@ that says ``hex:'' or ``word:'' is included.
 To choose a different
 .Ar algorithm
 from the default md5.  Pick any of: md4, md5, and sha.
+.El
 .It Fl h
 Print the passwords in hex.
 .It Fl n
diff --git a/appl/push/push.8 b/appl/push/push.8
index 33b94ac3a..d3970575d 100644
--- a/appl/push/push.8
+++ b/appl/push/push.8
@@ -40,7 +40,7 @@ can have any of the following formats:
 .It Ql hostname
 .It Ql po:username
 .El
-
+.Pp
 If no username is specified,
 .Nm
 assumes that it's the same as on the local machine; 
@@ -48,7 +48,7 @@ assumes that it's the same as on the local machine;
 defaults to the value of the
 .Ev MAILHOST
 environment variable.
-
+.Pp
 Supported options:
 .Bl -tag -width Ds
 .It Xo
@@ -93,11 +93,10 @@ use this port instead of the default
 or
 .Ql 1109 .
 .El
-
+.Pp
 The default is to first try Kerberos 5 authentication and then, if
 that fails, Kerberos 4.
 .Sh ENVIRONMENT
-
 .Bl -tag -width Ds
 .It Ev MAILHOST
 points to the post office, if no other hostname is specified.
@@ -107,7 +106,7 @@ points to the post office, if no other hostname is specified.
 .Bd -literal -offset indent
 $ push cornfield:roosta ~/.gnus-crash-box
 .Ed
-
+.Pp
 tries to fetch mail for the user
 .Ar roosta
 from the post office at
@@ -118,7 +117,7 @@ and stores the mail in
 .Bd -literal -offset indent
 $ push --from -5 havregryn
 .Ed
-
+.Pp
 tries to fetch 
 .Nm From: 
 lines for current user at post office
diff --git a/appl/telnet/telnet/telnet.1 b/appl/telnet/telnet/telnet.1
index 2b3198ec1..717038633 100644
--- a/appl/telnet/telnet/telnet.1
+++ b/appl/telnet/telnet/telnet.1
@@ -1251,10 +1251,12 @@ has ever been enabled, then
 is sent as
 .Ic abort  ,
 and
-.Ic eof and
-.B suspend
+.Ic eof
+and
+.Ic suspend
 are sent as
-.Ic eof and
+.Ic eof
+and
 .Ic susp ,
 see
 .Ic send
diff --git a/appl/telnet/telnetd/telnetd.8 b/appl/telnet/telnetd/telnetd.8
index 62cc4cdde..81c187fad 100644
--- a/appl/telnet/telnetd/telnetd.8
+++ b/appl/telnet/telnetd/telnetd.8
@@ -298,7 +298,9 @@ DO TIMING-MARK
 .Ed
 .Pp
 The pseudo-terminal allocated to the client is configured
-to operate in \*(lqcooked\*(rq mode, and with
+to operate in
+.Dq cooked
+mode, and with
 .Dv XTABS and
 .Dv CRMOD
 enabled (see
diff --git a/lib/kafs/kafs.3 b/lib/kafs/kafs.3
index 554d7bd44..5f6ae6eb1 100644
--- a/lib/kafs/kafs.3
+++ b/lib/kafs/kafs.3
@@ -11,8 +11,8 @@
 .Nm k_afs_cell_of_file ,
 .Nm krb_afslog ,
 .Nm krb_afslog_uid
-\" .Nm krb5_afslog ,
-\" .Nm krb5_afslog_uid
+.\" .Nm krb5_afslog ,
+.\" .Nm krb5_afslog_uid
 .Nd AFS library
 .Sh SYNOPSIS
 .Fd #include <kafs.h>
@@ -30,10 +30,10 @@
 .Fn krb_afslog "char *cell" "char *realm"
 .Ft int
 .Fn krb_afslog_uid "char *cell" "char *realm" "uid_t uid"
-\" .Ft krb5_error_code
-\" .Fn krb5_afslog_uid "krb5_context context" "krb5_ccache id" "const char *cell" "krb5_const_realm realm" "uid_t uid"
-\" .Ft krb5_error_code
-\" .Fn krb5_afslog "krb5_context context" "krb5_ccache id" "const char *cell" "krb5_const_realm realm"
+.\" .Ft krb5_error_code
+.\" .Fn krb5_afslog_uid "krb5_context context" "krb5_ccache id" "const char *cell" "krb5_const_realm realm" "uid_t uid"
+.\" .Ft krb5_error_code
+.\" .Fn krb5_afslog "krb5_context context" "krb5_ccache id" "const char *cell" "krb5_const_realm realm"
 .Sh DESCRIPTION
 .Fn k_hasafs
 initializes some library internal structures, and tests for the
@@ -41,7 +41,7 @@ presense of AFS in the kernel, none of the other functions should be
 called before 
 .Fn k_hasafs
 is called, or if it fails.
-
+.Pp
 .Fn krb_afslog ,
 and
 .Fn krb_afslog_uid
@@ -66,22 +66,22 @@ field in the token,
 .Fn krb_afslog_uid
 will use
 .Fa uid .
-
-\" .Fn krb5_afslog ,
-\" and 
-\" .Fn krb5_afslog_uid
-\" are the Kerberos 5 equivalents of
-\" .Fn krb_afslog ,
-\" and
-\" .Fn krb_afslog_uid .
-\" The extra arguments are the ubiquitous context, and the cache id where
-\" to store any obtained tickets. Since AFS servers normally can't handle
-\" Kerberos 5 tickets directly, these functions will first obtain version
-\" 5 tickets for the requested cells, and then convert them to version 4
-\" tickets, that can be stashed in the kernel. To convert tickets the
-\" .Fn krb524_convert_creds_kdc
-\" function will be used.
-
+.Pp
+.\" .Fn krb5_afslog ,
+.\" and 
+.\" .Fn krb5_afslog_uid
+.\" are the Kerberos 5 equivalents of
+.\" .Fn krb_afslog ,
+.\" and
+.\" .Fn krb_afslog_uid .
+.\" The extra arguments are the ubiquitous context, and the cache id where
+.\" to store any obtained tickets. Since AFS servers normally can't handle
+.\" Kerberos 5 tickets directly, these functions will first obtain version
+.\" 5 tickets for the requested cells, and then convert them to version 4
+.\" tickets, that can be stashed in the kernel. To convert tickets the
+.\" .Fn krb524_convert_creds_kdc
+.\" function will be used.
+.\" .Pp
 .Fn k_afs_cell_of_file
 will in 
 .Fa cell
@@ -89,23 +89,22 @@ return the cell of a specified file, no more than
 .Fa len
 characters is put in 
 .Fa cell .
-
+.Pp
 .Fn k_pioctl
 does a 
 .Fn pioctl
 syscall with the specified arguments. This function is equivalent to
 .Fn lpioctl .
-
+.Pp
 .Fn k_setpag
 initializes a new PAG.
-
+.Pp
 .Fn k_unlog
 removes destroys all tokens in the current PAG.
-
 .Sh ENVIRONMENT
 The following environment variable affect the mode of operation of
 .Nm kafs :
-.Bl -tag
+.Bl -tag -width AFS_SYSCALL
 .It Ev AFS_SYSCALL
 Normally,
 .Nm kafs
diff --git a/lib/roken/getarg.3 b/lib/roken/getarg.3
index cc125715d..e0b354626 100644
--- a/lib/roken/getarg.3
+++ b/lib/roken/getarg.3
@@ -9,13 +9,10 @@
 .Nd collect command line options
 .Sh SYNOPSIS
 .Fd #include <getarg.h>
-
 .Ft int
 .Fn getarg "struct getargs *args" "size_t num_args" "int argc" "char **argv" "int *optind"
-
 .Ft void
 .Fn arg_printusage "struct getargs *args" "size_t num_args" "const char *progname" "const char *extra_string"
-
 .Sh DESCRIPTION
 .Fn getarg
 collects any command line options given to a program in an easily used way. 
@@ -45,7 +42,8 @@ take the same
 and
 .Fa num_args
 as getarg;
-.Fa progname is the name of the program (to be used in the help text), and 
+.Fa progname
+is the name of the program (to be used in the help text), and 
 .Fa extra_string
 is a string to print after the actual options to indicate more
 arguments. The usefulness of this function is realised only be people
@@ -55,7 +53,6 @@ the code does.
 The
 .Fa getargs
 struct has the following elements.
-
 .Bd -literal
 struct getargs{
     const char *long_name;
@@ -176,7 +173,7 @@ and
 .Fa *optarg ,
 but to do this correct you (more or less) have to know about the inner
 workings of getarg.
- 
+.Pp 
 You can skip parts of arguments by increasing
 .Fa *optarg
 (you could
@@ -233,8 +230,6 @@ and if you're really confused you can do it multiple times
 .Pf ( Fl -no-no-help= Ns Ar false ,
 or even 
 .Fl -no-no-help= Ns Ar maybe ) .
-
-.Pp
 .Sh EXAMPLE
 .Bd -literal
 #include <stdio.h>
@@ -276,11 +271,11 @@ main(int argc, char **argv)
 	exit (0);
     }
     if (destination == NULL) {
-	fprintf(stderr, "%s: must specify destination\n", progname);
+	fprintf(stderr, "%s: must specify destination\en", progname);
 	exit(1);
     }
     if (strcmp(source, destination) == 0) {
-	fprintf(stderr, "%s: destination must be different from source\n");
+	fprintf(stderr, "%s: destination must be different from source\en");
 	exit(1);
     }
     /* include more stuff here ... */
@@ -298,7 +293,6 @@ Usage: ship++ [--source=city] [-s city] [--destination=city] [-d city]
 -w tons, --weight=tons      weight of shippment
 -c, --no-catalog            include product catalog
 .Ed
-
 .Sh BUGS
 It should be more flexible, so it would be possible to use other more
 complicated option syntaxes, such as what