diff --git a/bin/named/client.c b/bin/named/client.c
index 92035de608..19fa2251b8 100644
--- a/bin/named/client.c
+++ b/bin/named/client.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.c,v 1.264 2009/03/03 23:48:02 tbox Exp $ */
+/* $Id: client.c,v 1.265 2009/05/07 09:41:21 fdupont Exp $ */
 
 #include <config.h>
 
@@ -1472,7 +1472,7 @@ client_request(isc_task_t *task, isc_event_t *event) {
 
 	/*
 	 * Silently drop multicast requests for the present.
-	 * XXXMPA look at when/if mDNS spec stabilizes.
+	 * XXXMPA revisit this as mDNS spec was published.
 	 */
 	if ((client->attributes & NS_CLIENTATTR_MULTICAST) != 0) {
 		ns_client_log(client, NS_LOGCATEGORY_CLIENT,
diff --git a/bin/named/include/named/client.h b/bin/named/include/named/client.h
index 1267972d07..f6956454e1 100644
--- a/bin/named/include/named/client.h
+++ b/bin/named/include/named/client.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: client.h,v 1.89 2009/03/03 01:36:17 marka Exp $ */
+/* $Id: client.h,v 1.90 2009/05/07 09:41:22 fdupont Exp $ */
 
 #ifndef NAMED_CLIENT_H
 #define NAMED_CLIENT_H 1
@@ -300,7 +300,7 @@ ns_client_checkaclsilent(ns_client_t *client, isc_netaddr_t *netaddr,
  *
  * Returns:
  *\li	ISC_R_SUCCESS	if the request should be allowed
- * \li	ISC_R_REFUSED	if the request should be denied
+ * \li	DNS_R_REFUSED	if the request should be denied
  *\li	No other return values are possible.
  */
 
diff --git a/bin/named/query.c b/bin/named/query.c
index 98f4bf000b..42d036c0a8 100644
--- a/bin/named/query.c
+++ b/bin/named/query.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: query.c,v 1.323 2009/04/30 11:45:10 fdupont Exp $ */
+/* $Id: query.c,v 1.324 2009/05/07 09:41:22 fdupont Exp $ */
 
 /*! \file */
 
@@ -2851,7 +2851,7 @@ query_addwildcardproof(ns_client_t *client, dns_db_t *db,
 	 *  j.example -> z.i.example NSEC example
 	 *	owner common example
 	 *	next common example
-	 *	wild *.f.example
+	 *	wild *.example
 	 */
 	options = client->query.dboptions | DNS_DBFIND_NOWILD;
 	dns_fixedname_init(&wfixed);
diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index 40864efbac..e4e89efe1c 100644
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: db.h,v 1.96 2009/01/17 12:31:49 fdupont Exp $ */
+/* $Id: db.h,v 1.97 2009/05/07 09:41:23 fdupont Exp $ */
 
 #ifndef DNS_DB_H
 #define DNS_DB_H 1
@@ -836,6 +836,9 @@ dns_db_find(dns_db_t *db, dns_name_t *name, dns_dbversion_t *version,
  *	\li	#DNS_R_COVERINGNSEC		The returned data is a NSEC
  *						that potentially covers 'name'.
  *
+ *	\li	#DNS_R_EMPTYWILD		The name is a wildcard without
+ *						resource records.
+ *
  *	Error results:
  *
  *	\li	#ISC_R_NOMEMORY
diff --git a/lib/dns/resolver.c b/lib/dns/resolver.c
index f0b0236def..9e51a5b440 100644
--- a/lib/dns/resolver.c
+++ b/lib/dns/resolver.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: resolver.c,v 1.394 2009/03/01 02:45:38 each Exp $ */
+/* $Id: resolver.c,v 1.395 2009/05/07 09:41:22 fdupont Exp $ */
 
 /*! \file */
 
@@ -5039,7 +5039,7 @@ noanswer_response(fetchctx_t *fctx, dns_name_t *oqname,
 					 *
 					 * These should only be here if
 					 * this is a referral, and there
-					 * should only be one DS.
+					 * should only be one DS RRset.
 					 */
 					if (ns_name == NULL)
 						return (DNS_R_FORMERR);
diff --git a/lib/dns/validator.c b/lib/dns/validator.c
index 528c3132cc..3578e2a258 100644
--- a/lib/dns/validator.c
+++ b/lib/dns/validator.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: validator.c,v 1.174 2009/05/07 02:34:19 marka Exp $ */
+/* $Id: validator.c,v 1.175 2009/05/07 09:41:22 fdupont Exp $ */
 
 #include <config.h>
 
@@ -368,7 +368,7 @@ isdelegation(dns_name_t *name, dns_rdataset_t *rdataset,
 }
 
 /*%
- * We have been asked to to look for a key.
+ * We have been asked to look for a key.
  * If found resume the validation process.
  * If not found fail the validation process.
  */
@@ -1014,7 +1014,7 @@ nsec3noexistnodata(dns_validator_t *val, dns_name_t* name,
 			if (ns && !soa) {
 				if (!atparent) {
 					/*
-					 * This NSEC record is from somewhere
+					 * This NSEC3 record is from somewhere
 					 * higher in the DNS, and at the
 					 * parent of a delegation. It can not
 					 * be legitimately used here.
@@ -1025,7 +1025,7 @@ nsec3noexistnodata(dns_validator_t *val, dns_name_t* name,
 				}
 			} else if (atparent && ns && soa) {
 				/*
-				 * This NSEC record is from the child.
+				 * This NSEC3 record is from the child.
 				 * It can not be legitimately used here.
 				 */
 				validator_log(val, ISC_LOG_DEBUG(3),
@@ -2921,7 +2921,6 @@ nsecvalidate(dns_validator_t *val, isc_boolean_t resume) {
 			      "nonexistence proof(s) found");
 		return (ISC_R_SUCCESS);
 	}
-		findnsec3proofs(val);
 
 	validator_log(val, ISC_LOG_DEBUG(3),
 		      "nonexistence proof(s) not found");
diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 61e872ceed..677f991051 100644
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -15,7 +15,7 @@
  * PERFORMANCE OF THIS SOFTWARE.
  */
 
-/* $Id: zone.c,v 1.491 2009/04/28 23:48:01 tbox Exp $ */
+/* $Id: zone.c,v 1.492 2009/05/07 09:41:22 fdupont Exp $ */
 
 /*! \file */
 
@@ -8686,7 +8686,7 @@ dns_zone_notifyreceive(dns_zone_t *zone, isc_sockaddr_t *from,
 	REQUIRE(DNS_ZONE_VALID(zone));
 
 	/*
-	 * If type != T_SOA return DNS_R_REFUSED.  We don't yet support
+	 * If type != T_SOA return DNS_R_NOTIMP.  We don't yet support
 	 * ROLLOVER.
 	 *
 	 * SOA:	RFC1996