diff --git a/checkin_notes b/checkin_notes
index 24008ccfb3..1fe8c63e12 100755
--- a/checkin_notes
+++ b/checkin_notes
@@ -13637,4 +13637,15 @@ Charlie 22 Dec 2006
     clientgui/
         sg_DlgMessages.cpp
         sg_DlgPreferences.cpp
-        
\ No newline at end of file
+        
+David  23 Dec 2006
+    - core client: add missing error message case on attach failure
+    - DB: user "tinyint not null default 0" for bools;
+        no need to single-quote table and column names in queries
+
+    client/
+        cs_account.C
+    db/
+        schema.sql
+    html/ops/
+        db_update.php
diff --git a/client/cs_account.C b/client/cs_account.C
index c286831c61..5ac2d002f8 100644
--- a/client/cs_account.C
+++ b/client/cs_account.C
@@ -499,6 +499,14 @@ void PROJECT::attach_failed(int error_num) {
             master_url
         );
         break;
+    case ERR_ATTACH_FAIL_SERVER_ERROR:
+        msg_printf(this, MSG_ERROR, "Can't attach - server error");
+        break;
+    default:
+        msg_printf(this, MSG_ERROR,
+            "Can't attach - unknown error", error_num
+        );
+        break;
     }
     gstate.detach_project(this);
 }
diff --git a/db/schema.sql b/db/schema.sql
index af5a02c9e8..c526abf1c6 100644
--- a/db/schema.sql
+++ b/db/schema.sql
@@ -372,8 +372,8 @@ create table thread (
         -- when this record was created
     hidden              integer     not null,
         -- nonzero if hidden by moderators
-    sticky              tinyint unsigned not null default 0,
-    locked              tinyint unsigned not null default 0,
+    sticky              tinyint not null default 0,
+    locked              tinyint not null default 0,
     primary key (id)
 );
 
diff --git a/doc/boinc_dev.php b/doc/boinc_dev.php
index bef16326b0..cf9cfc0f06 100644
--- a/doc/boinc_dev.php
+++ b/doc/boinc_dev.php
@@ -119,6 +119,27 @@ with file deletion according to project policy.
 <li> Sortable columns in the Work tab.
 </ul>
 
+<li> Server/Back End:
+    <ul>
+    <li> Implement a mechanism so that server
+        software detects incompatible database format
+    <li> 
+        Scheduler: implement mechanisms so that server:
+        <ul>
+        <li> Sends only results likely to finish by their deadline
+        <li> Sends commands to abort results that can't get credit
+        <li> Sends commands to recommend abort of results
+            that may get credit, but are not useful
+            (i.e. canonical result already found)
+        <li> Attempts to send results from the same WU to
+            hosts with similar speed,
+            so that a fast host doesn't have to wait weeks to get credit.
+        </ul>
+    <li> Implement a 'benchmark result' mechanism:
+        every host runs a benchmark result per app version,
+        and the CPU time determines credit/CPU for future results
+    </ul>
+
 
 </ul>
 Please check with <a href=contact.php>David Anderson</a>
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 9455aa8e1e..423e4f6b55 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,11 @@
 <?
 
 $project_news = array(
+array("December 21, 2006",
+    "Some AOL users are unable to attach to some projects.
+    A work-around for this problem is described
+    <a href=http://boinc.berkeley.edu/aol.php>here</a>."
+),
 array("December 8, 2006",
     "<a href=http://boinc.berkeley.edu/skins.php><img align=right src=images/boinccast_small.png></a>
     Olaf Bornack of
diff --git a/doc/projects.inc b/doc/projects.inc
index c945ed66e6..dc6380bfb0 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -123,6 +123,14 @@ $astro_phys_chem = array(
 $math = array(
     "Mathematics and strategy games",
     array(
+        array(
+            "PrimeGrid",
+            "http://primegrid.com",
+            "Private",
+            "Cryptography",
+            "Primegrid is generating a public sequential prime number database, and is searching for large twin primes of the form k*2<sup>n</sup>+1 and k*2<sup>n</sup>-1",
+            "primegrid_logo.png"
+        ),
         array(
             "SZTAKI Desktop Grid",
             "http://szdg.lpds.sztaki.hu/szdg/",
diff --git a/html/ops/db_update.php b/html/ops/db_update.php
index fdb0b78d38..f838af187a 100644
--- a/html/ops/db_update.php
+++ b/html/ops/db_update.php
@@ -343,7 +343,7 @@ function update_10_26_2006() {
 }
 
 function update_11_10_2006() {
-    do_query("ALTER TABLE `thread` ADD `locked` SMALLINT NOT NULL DEFAULT '0'");
+    do_query("ALTER TABLE thread ADD locked TINYINT NOT NULL DEFAULT 0");
 }
 
 //update_11_10_2006();