diff --git a/checkin_notes b/checkin_notes
index 4116ee1d02..0a244f2fb4 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -4146,3 +4146,16 @@ Walt   21 Apr 2006
 
     client/
         http_curl.C
+
+David  21 Apr 2006
+	- Kludge to make things work even when a project left out
+		a </gui_url> tag in its GUI URL list.
+	- comment out google/yahoo code in the BOINC Manager.
+		Rom: please finish this job
+
+	clientgui/
+		AccountManagerPropertiesPage.cpp
+		BOINCDialupManager.cpp
+		ProjectPropertiesPage.cpp
+	lib/
+		gui_rpc_client_ops.C
diff --git a/clientgui/AccountManagerPropertiesPage.cpp b/clientgui/AccountManagerPropertiesPage.cpp
index 73a488ab23..fcc3061dcc 100644
--- a/clientgui/AccountManagerPropertiesPage.cpp
+++ b/clientgui/AccountManagerPropertiesPage.cpp
@@ -319,6 +319,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
                 SetNextState(ACCTMGRPROP_COMMUNICATEYAHOO_BEGIN);
             }
             break;
+#if 0
         case ACCTMGRPROP_COMMUNICATEYAHOO_BEGIN:
             SetNextState(ACCTMGRPROP_COMMUNICATEYAHOO_EXECUTE);
             break;
@@ -384,7 +385,7 @@ void CAccountManagerPropertiesPage::OnStateChange( CAccountManagerPropertiesPage
             } else {
                 SetCommunicateGoogleSucceeded(false);
             }
-
+#endif
             SetNextState(ACCTMGRPROP_DETERMINENETWORKSTATUS_BEGIN);
             break;
         case ACCTMGRPROP_DETERMINENETWORKSTATUS_BEGIN:
diff --git a/clientgui/BOINCDialupManager.cpp b/clientgui/BOINCDialupManager.cpp
index 22fe6f6410..0fc5174897 100644
--- a/clientgui/BOINCDialupManager.cpp
+++ b/clientgui/BOINCDialupManager.cpp
@@ -248,11 +248,13 @@ void CBOINCDialUpManager::poll() {
             wxTimeSpan tsTimeout = wxDateTime::Now() - m_dtDialupConnectionTimeout;
             if (30 > tsTimeout.GetSeconds()) {
                 if(m_iConnectAttemptRetVal != BOINC_SUCCESS) {
+#if 0
                     if (m_iConnectAttemptRetVal != ERR_IN_PROGRESS) {
                         // Attempt to successfully download the Google homepage
                         pDoc->rpc.lookup_website(LOOKUP_GOOGLE);
                     }
                     m_iConnectAttemptRetVal = pDoc->rpc.lookup_website_poll();
+#endif
                     return;
                 }
             }
diff --git a/clientgui/ProjectPropertiesPage.cpp b/clientgui/ProjectPropertiesPage.cpp
index fc6323e19d..b0fd1fa086 100644
--- a/clientgui/ProjectPropertiesPage.cpp
+++ b/clientgui/ProjectPropertiesPage.cpp
@@ -457,6 +457,7 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
                 SetNextState(PROJPROP_COMMUNICATEYAHOO_BEGIN);
             }
             break;
+#if 0
         case PROJPROP_COMMUNICATEYAHOO_BEGIN:
             SetNextState(PROJPROP_COMMUNICATEYAHOO_EXECUTE);
             break;
@@ -525,6 +526,7 @@ void CProjectPropertiesPage::OnStateChange( CProjectPropertiesPageEvent& event )
 
             SetNextState(PROJPROP_DETERMINENETWORKSTATUS_BEGIN);
             break;
+#endif
         case PROJPROP_DETERMINENETWORKSTATUS_BEGIN:
             SetNextState(PROJPROP_DETERMINENETWORKSTATUS_EXECUTE);
             break;
diff --git a/doc/rr_sim.odg b/doc/rr_sim.odg
index 32857de6ae..0f137b9052 100644
Binary files a/doc/rr_sim.odg and b/doc/rr_sim.odg differ
diff --git a/lib/gui_rpc_client_ops.C b/lib/gui_rpc_client_ops.C
index 52b8eb9cfe..758ef51d7d 100644
--- a/lib/gui_rpc_client_ops.C
+++ b/lib/gui_rpc_client_ops.C
@@ -82,6 +82,7 @@ int GUI_URL::parse(MIOFILE& in) {
     char buf[256];
     while (in.fgets(buf, 256)) {
         if (match_tag(buf, "</gui_url>")) return 0;
+        if (match_tag(buf, "</gui_urls>")) break;
         else if (parse_str(buf, "<name>", name)) continue;
         else if (parse_str(buf, "<description>", description)) continue;
         else if (parse_str(buf, "<url>", url)) continue;
@@ -187,9 +188,8 @@ int PROJECT::parse(MIOFILE& in) {
                 else if (match_tag(buf, "<gui_url>")) {
                     GUI_URL gu;
                     retval = gu.parse(in);
-                    if (!retval) {
-                        gui_urls.push_back(gu);
-                    }
+                    if (retval) break;
+                    gui_urls.push_back(gu);
                 }
             }
             continue;