diff --git a/g10/ChangeLog b/g10/ChangeLog
index 96ba9476e..800af3510 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,11 @@
 2002-07-01  David Shaw  <dshaw@jabberwocky.com>
 
+	* options.skel: Fix a few typos, clarify "group", and remove
+	sample photo viewers for Win32 since they are the defaults now.
+
+	* parse-packet.c (make_attribute_uidname), keylist.c
+	(dump_attribs): Fix two typecast warnings.
+
 	* packet.h, build-packet.c (build_attribute_subpkt), exec.c
 	(expand_args), mkdtemp.c (mkdtemp), photoid.c
 	(parse_image_header): Fix some signedness compiler warnings.
diff --git a/g10/keylist.c b/g10/keylist.c
index e226ee071..7a15c9b5c 100644
--- a/g10/keylist.c
+++ b/g10/keylist.c
@@ -373,7 +373,7 @@ static void dump_attribs(const PKT_user_id *uid,
 	    sprintf(buf+2*j, "%02X", *p );
 
 	  sprintf(buf+strlen(buf)," %lu %u %u %u %lu %lu %u",
-		  uid->attribs[i].len,uid->attribs[i].type,i+1,
+		  (ulong)uid->attribs[i].len,uid->attribs[i].type,i+1,
 		  uid->numattribs,(ulong)uid->created,(ulong)uid->expiredate,
 		  ((uid->is_primary?0x01:0)|
 		   (uid->is_revoked?0x02:0)|
diff --git a/g10/options.skel b/g10/options.skel
index 93bcfcd57..1d0906eea 100644
--- a/g10/options.skel
+++ b/g10/options.skel
@@ -2,7 +2,7 @@ These first three lines are not copied to the options file in
 the users home directory.
 $Id$
 # Options for GnuPG
-# Copyright 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+# Copyright 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
 # 
 # This file is free software; as a special exception the author gives
 # unlimited permission to copy and/or distribute it, with or without
@@ -13,7 +13,7 @@ $Id$
 # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 #
 # Unless you you specify which option file to use (with the
-# commandline option "--options filename"), GnuPG uses the
+# command line option "--options filename"), GnuPG uses the
 # file ~/.gnupg/options by default.
 #
 # An option file can contain all long options which are
@@ -27,7 +27,7 @@ $Id$
 #no-greeting
 
 # If you have more than 1 secret key in your keyring, you may want
-# to uncomment the following option and set your preffered keyid
+# to uncomment the following option and set your preferred keyid
 
 #default-key 621CC013
 
@@ -62,10 +62,12 @@ $Id$
 # Group names may be defined like this:
 #   group mynames paige 0x12345678 joe patti
 #
-# Any time "mynames" is a receipient (-r or --recipient), it will be
+# Any time "mynames" is a recipient (-r or --recipient), it will be
 # expanded to the names "paige", "joe", and "patti", and the key ID
 # "0x12345678".  Note there is only one level of expansion - you
-# cannot make an group that points to another group.
+# cannot make an group that points to another group.  Note if there
+# are spaces in the recipient name, this will appear as two
+# recipients.  In this case, it is better to use the key ID.
 
 # lock the file only once for the lifetime of a process.
 # if you do not define this, the lock will be obtained and released
@@ -162,6 +164,7 @@ lock-once
 # generating and then cleaning up a secure temp file.
 #
 # The default program is "xloadimage -fork -quiet -title 'KeyID 0x%k' stdin"
+# On Mac OS X and Windows, the default is to use your regular image viewer.
 #
 # Some other viewers:
 # photo-viewer "qiv %i"
@@ -173,12 +176,6 @@ lock-once
 #
 # Use your MIME handler to view photos:
 # photo-viewer "metamail -q -d -b -c %T -s 'KeyID 0x%k' -f GnuPG"
-#
-# Use the Win32 registry to pick a viewer for you:
-#    On Win95/98/Me (also the default on Win32):
-# photo-viewer "start /w"
-#    On NT/2k/XP:
-# photo-viewer "cmd /c start /w"
 
 
 # Passphrase agent
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index d57659b6b..f922a6551 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1844,7 +1844,8 @@ make_attribute_uidname(PKT_user_id *uid)
 	    sprintf(uid->name,"[invalid image]");
 	}
       else
-	sprintf(uid->name,"[unknown attribute of size %lu]",uid->attribs->len);
+	sprintf(uid->name,"[unknown attribute of size %lu]",
+		(ulong)uid->attribs->len);
     }
 
   uid->len = strlen(uid->name);