diff --git a/checkin_notes b/checkin_notes
index a015540531..97658eceb1 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -4866,3 +4866,11 @@ David  13 June 2008
             team_founder_transfer_form.php
             team_founder_transfer_action.php
             team_display.php
+
+David  14 June 2008
+    - manager: fix some strings ("comm" is not an OK abbrev.)
+        Also got rid of references to Yahoo.
+
+    clientgui/
+        WelcomePage.cpp,h
+        BOINCWizards.h
diff --git a/clientgui/BOINCWizards.h b/clientgui/BOINCWizards.h
index aca0bfd34c..51afba0f95 100644
--- a/clientgui/BOINCWizards.h
+++ b/clientgui/BOINCWizards.h
@@ -78,7 +78,6 @@
 #define ID_ERRPROJECTALREADYATTACHED 11106
 #define ID_ERRPROJECTATTACHFAILURE 11107
 #define ID_ERRGOOGLECOMM 11108
-#define ID_ERRYAHOOCOMM 11109
 #define ID_ERRNETDETECTION 11110
 
 // Project Info/Account Manager Info Controls
@@ -155,7 +154,6 @@ class wxHyperLink;
 //
 #define WIZDEBUG_ERRPROJECTPROPERTIES                 0x00000001
 #define WIZDEBUG_ERRPROJECTPROPERTIESURL              0x00000002
-#define WIZDEBUG_ERRYAHOOCOMM                         0x00000004
 #define WIZDEBUG_ERRGOOGLECOMM                        0x00000008
 #define WIZDEBUG_ERRNETDETECTION                      0x00000010
 #define WIZDEBUG_ERRPROJECTCOMM                       0x00000020
diff --git a/clientgui/WelcomePage.cpp b/clientgui/WelcomePage.cpp
index 02c29e25a2..7304f21bef 100644
--- a/clientgui/WelcomePage.cpp
+++ b/clientgui/WelcomePage.cpp
@@ -102,7 +102,6 @@ bool CWelcomePage::Create( CBOINCBaseWizard* parent )
     m_pErrProjectAlreadyAttachedCtrl = NULL;
     m_pErrProjectAttachFailureCtrl = NULL;
     m_pErrGoogleCommCtrl = NULL;
-    m_pErrYahooCommCtrl = NULL;
     m_pErrNetDetectionCtrl = NULL;
 #endif
 ////@end CWelcomePage member initialisation
@@ -198,13 +197,6 @@ void CWelcomePage::CreateControls()
 
     itemFlexGridSizer8->Add(5, 5, 0, wxALIGN_CENTER_HORIZONTAL|wxALIGN_CENTER_VERTICAL|wxALL, 5);
 
-    m_pErrYahooCommCtrl = new wxCheckBox;
-    m_pErrYahooCommCtrl->Create( itemWizardPage2, ID_ERRYAHOOCOMM, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
-    m_pErrYahooCommCtrl->SetValue(FALSE);
-    itemFlexGridSizer8->Add(m_pErrYahooCommCtrl, 0, wxGROW|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
-    itemFlexGridSizer8->Add(5, 5, 0, wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL|wxALL, 0);
-
     m_pErrNetDetectionCtrl = new wxCheckBox;
     m_pErrNetDetectionCtrl->Create( itemWizardPage2, ID_ERRNETDETECTION, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxCHK_2STATE );
     m_pErrNetDetectionCtrl->SetValue(FALSE);
@@ -312,7 +304,6 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
     wxASSERT(m_pErrProjectAlreadyAttachedCtrl);
     wxASSERT(m_pErrProjectAttachFailureCtrl);
     wxASSERT(m_pErrGoogleCommCtrl);
-    wxASSERT(m_pErrYahooCommCtrl);
     wxASSERT(m_pErrNetDetectionCtrl);
 #endif
 
@@ -391,7 +382,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
         _("Project Properties Failure")
     );
     m_pErrProjectCommCtrl->SetLabel(
-        _("Project Comm Failure")
+        _("Project Communication Failure")
     );
     m_pErrProjectPropertiesURLCtrl->SetLabel(
         _("Project Properties URL Failure")
@@ -412,10 +403,7 @@ void CWelcomePage::OnPageChanged( wxWizardExEvent& event ) {
         _("Project Attach Failure")
     );
     m_pErrGoogleCommCtrl->SetLabel(
-        _("Google Comm Failure")
-    );
-    m_pErrYahooCommCtrl->SetLabel(
-        _("Yahoo Comm Failure")
+        _("Failure Communicating with Reference Site")
     );
     m_pErrNetDetectionCtrl->SetLabel(
         _("Net Detection Failure")
@@ -452,9 +440,6 @@ void CWelcomePage::OnPageChanging( wxWizardExEvent& event ) {
     if (m_pErrGoogleCommCtrl->GetValue()) {
         ulFlags |= WIZDEBUG_ERRGOOGLECOMM;
     }
-    if (m_pErrYahooCommCtrl->GetValue()) {
-        ulFlags |= WIZDEBUG_ERRYAHOOCOMM;
-    }
     if (m_pErrAccountAlreadyExistsCtrl->GetValue()) {
         ulFlags |= WIZDEBUG_ERRACCOUNTALREADYEXISTS;
     }
diff --git a/clientgui/WelcomePage.h b/clientgui/WelcomePage.h
index 08959480db..e3a7cc2e17 100644
--- a/clientgui/WelcomePage.h
+++ b/clientgui/WelcomePage.h
@@ -97,7 +97,6 @@ public:
     wxCheckBox* m_pErrProjectAlreadyAttachedCtrl;
     wxCheckBox* m_pErrProjectAttachFailureCtrl;
     wxCheckBox* m_pErrGoogleCommCtrl;
-    wxCheckBox* m_pErrYahooCommCtrl;
     wxCheckBox* m_pErrNetDetectionCtrl;
 #endif
 ////@end CWelcomePage member variables
diff --git a/db/bossa_schema.sql b/db/bossa_schema.sql
index f9460699de..c563260596 100644
--- a/db/bossa_schema.sql
+++ b/db/bossa_schema.sql
@@ -22,6 +22,7 @@ create table bossa_job (
     create_time         integer     not null,
     name                varchar(255) not null,
     app_id              integer     not null,
+    batch_id            integer     not null,
     info                text,
     batch               integer     not null,
     time_estimate       integer     not null,
@@ -50,5 +51,13 @@ create table bossa_user (
     user_id             integer     not null,
     flags               integer     not null,
     info                text
-        -- Project-dependent info about user's ability and performance.
+        -- Project-dependent info about users ability and performance.
+);
+
+create table bossa_batch (
+    id                  integer     not null auto_increment,
+    create_time         integer     not null,
+    app_id              integer     not null,
+    state               integer     not null,
+    primary key(id)
 );
diff --git a/doc/links.php b/doc/links.php
index 4e6710df56..4b98c16040 100644
--- a/doc/links.php
+++ b/doc/links.php
@@ -300,6 +300,7 @@ language("Slovak", array(
     site("http://www.boinc.sk/", "www.boinc.sk")
 ));
 language("Spanish", array(
+    site("http://www.easyboinc.org/", "Computación Distribuida"),
     site("http://foro.noticias3d.com/vbulletin/showthread.php?t=192297", "Noticias3D"),
     site("http://elmajo.blogspot.com", "Computación Distribuida"),
     site("http://efren-canarias.blogcindario.com/", "El Pais De La Computacion"),