diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java
index 1754ed96f46..dc2fef1015f 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/BrowserControlFactory.java
@@ -38,13 +38,13 @@ import java.io.FileNotFoundException;
 
 /**
  *
- *  <p><B>BrowserControlFactory</B> uses the discovery algorithm below
- *  to find an implementation of {@link WebclientFactory}.  All of the
- *  public static methods in this class simply call through to this
- *  implemenatation instance.</p>
+ *  <p><B>BrowserControlFactory</B> uses {@link
+ *  Utilities#getImplFromServices} to find an implementation of {@link
+ *  WebclientFactory}.  All of the public static methods in this class
+ *  simply call through to this implemenatation instance.</p>
  *
  *
- * @version $Id: BrowserControlFactory.java,v 1.9 2003-09-28 06:29:04 edburns%acm.org Exp $
+ * @version $Id: BrowserControlFactory.java,v 1.10 2004-04-01 14:54:56 edburns%acm.org Exp $
  * 
  *
  */
diff --git a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java
index 3ed9c1bc182..8e4414eda57 100644
--- a/mozilla/java/webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java
+++ b/mozilla/java/webclient/classes_spec/org/mozilla/webclient/WebclientFactory.java
@@ -30,11 +30,11 @@ import java.io.File;
 import java.io.FileNotFoundException;
 
 /**
- * <p>This interface allows a pluggable webclient API implementation.
- * The static methods in {@link BrowserControlFactory} call through to
- * methods on this interface.  Please see {@link BrowserControlFactory}
- * for information on how to hook up your <code>WebclientFactory</code>
- * implementation to the <code>BrowserControlFactory</code></p>
+ * <p>Do per-app one-time initialization and shutdown, as well as being
+ * the factory for per-window {@link BrowserControl} instances.  This
+ * interface allows a pluggable webclient API implementation.  The
+ * static methods in {@link BrowserControlFactory} call through to
+ * methods on this interface.</p>
  */
 
 public interface WebclientFactory {
diff --git a/mozilla/java/webclient/src_moz/rdf_util.cpp b/mozilla/java/webclient/src_moz/rdf_util.cpp
index d57d62c08ba..cf7df4ca67a 100644
--- a/mozilla/java/webclient/src_moz/rdf_util.cpp
+++ b/mozilla/java/webclient/src_moz/rdf_util.cpp
@@ -35,7 +35,7 @@ static PRBool rdf_inited = PR_FALSE;
 
 nsCOMPtr<nsIRDFContainerUtils> gRDFCU = nsnull;
 nsCOMPtr<nsIRDFService> gRDF = nsnull;
-nsCOMPtr<nsIBookmarksService> gBookmarks = nsnull;
+nsCOMPtr<nsIBookmarksService> gBookmarks = nsnull; // PENDING(edburns): this should be in WebclientContext
 nsCOMPtr<nsIRDFDataSource> gBookmarksDataSource = nsnull;
 
 nsCOMPtr<nsIRDFResource> kNC_BookmarksRoot = nsnull;
diff --git a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java
index 15bbd3b0ec1..538d72c6008 100644
--- a/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java
+++ b/mozilla/java/webclient/test/automated/src/classes/org/mozilla/webclient/PreferencesTest.java
@@ -1,5 +1,5 @@
 /*
- * $Id: PreferencesTest.java,v 1.1 2003-09-28 06:29:18 edburns%acm.org Exp $
+ * $Id: PreferencesTest.java,v 1.2 2004-04-01 14:54:57 edburns%acm.org Exp $
  */
 
 /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
@@ -104,6 +104,8 @@ public class PreferencesTest extends WebclientTestCase {
 	// test that our pref-change callback has not been called.
 	assertFalse(System.getProperty(PREFNAME).equals(CLOSURE));
 	
+	// clear the preference
+	prefs.setPref(PREFNAME, null);
 
 	BrowserControlFactory.deleteBrowserControl(firstBrowserControl);
 	BrowserControlFactory.appTerminate();