diff --git a/checkin_notes b/checkin_notes
index 041a55201b..cee711245a 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -534,16 +534,16 @@ David  21 Jan 2009
         sched_plan.cpp
 
 David  21 Jan 2009
-	- client: fetch work from non-CPU-intensive projects
+    - client: fetch work from non-CPU-intensive projects
 
-	client/
-		work_fetch.cpp,h
+    client/
+        work_fetch.cpp,h
 
 David  21 Jan 2009
     - client: compile fix, remove spurious message
 
-	client/
-		work_fetch.cpp,h
+    client/
+        work_fetch.cpp,h
 
 Rom    21 Jan 2009
     - MGR: Make sure the UI thread doesn't call a GUI RPC
@@ -640,17 +640,24 @@ Charlie Jan 22 2009
         BOINCListCtrl.cpp,.h
 
 David  23 Jan 2009
-	- client: clear debts when reset project
-	- client: respect work-fetch backoff for non-CPU-intensive projects
-	- client: for non-CPU-intensive project, fetch new job
-		if no currently running jobs
-	- client: skip non-CPU-intensive projects in debt calculations
-	- manager: show resource backoff times correctly
+    - client: clear debts when reset project
+    - client: respect work-fetch backoff for non-CPU-intensive projects
+    - client: for non-CPU-intensive project, fetch new job
+        if no currently running jobs
+    - client: skip non-CPU-intensive projects in debt calculations
+    - manager: show resource backoff times correctly
 
-	client/
-		app_control.cpp
-		client_state.cpp
-		client_types.cpp,h
-		work_fetch.cpp,h
-	clientgui/
-		DlgItemProperties.cpp
+    client/
+        app_control.cpp
+        client_state.cpp
+        client_types.cpp,h
+        work_fetch.cpp,h
+    clientgui/
+        DlgItemProperties.cpp
+
+David  23 Jan 2009
+    - scheduler: for plan class "nci", set flops to CPU speed;
+        this will give consistent completion time estimates for existing WUs.
+
+    sched/
+        sched_plan.cpp
diff --git a/doc/boinc_news.php b/doc/boinc_news.php
index 6fd03c199b..a66a5bbb83 100644
--- a/doc/boinc_news.php
+++ b/doc/boinc_news.php
@@ -1,6 +1,11 @@
 <?
 
 $project_news = array(
+array("January 22, 2009",
+    "A <a href=http://boinc.berkeley.edu/images/Cochran_SRL_2009.pdf>paper
+    about Quake-Catcher Network</a> appeared in
+    Seismological Research Letters, Jan/Feb 2009."
+),
 array("January 20, 2009",
     "A paper about BOINC,
     \"<a href=http://boinc.berkeley.edu/boinc_papers/hicss_08/hicss_08.pdf>Celebrating Diversity in Volunteer Computing</a>\",
diff --git a/doc/projects.inc b/doc/projects.inc
index f4886f40bf..6856e23203 100644
--- a/doc/projects.inc
+++ b/doc/projects.inc
@@ -103,12 +103,12 @@ $astro_phys_chem = array(
     "Astronomy/Physics/Chemistry",
     array(
         array(
-            "AQUA@home",
-            "http://aqua.dwavesys.com/",
-            "D-Wave Systems, Inc.",
-            "Quantum computing",
-            "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose goal is to predict the performance of superconducting adiabatic quantum computers on a variety of hard problems arising in fields ranging from materials science to machine learning. AQUA@home uses Internet-connected computers to help design and analyze quantum computing algorithms, using Quantum Monte Carlo techniques.",
-            "logo_dwave2.png"
+            "Milkyway@home",
+            "http://milkyway.cs.rpi.edu/milkyway/",
+            "Rensselaer Polytechnic Institute",
+            "Astronomy",
+            "The goal of Milkyway@Home is to create a highly accurate three dimensional model of the Milky Way galaxy using data gathered by the Sloan Digital Sky Survey.",
+            "mw.png",
         ),
         array(
             "Leiden Classical",
@@ -190,8 +190,16 @@ $mixed = array(
     ),
 );
 $math = array(
-    "Mathematics and strategy games",
+    "Mathematics, computing, and games",
     array(
+        array(
+            "AQUA@home",
+            "http://aqua.dwavesys.com/",
+            "D-Wave Systems, Inc.",
+            "Quantum computing",
+            "D-Wave's AQUA (Adiabatic QUantum Algorithms) is a research project whose goal is to predict the performance of superconducting adiabatic quantum computers on a variety of hard problems arising in fields ranging from materials science to machine learning. AQUA@home uses Internet-connected computers to help design and analyze quantum computing algorithms, using Quantum Monte Carlo techniques.",
+            "logo_dwave2.png"
+        ),
         array(
             "SHA-1 Collision Search Graz",
             "http://boinc.iaik.tugraz.at/sha1_coll_search/",
diff --git a/sched/sched_plan.cpp b/sched/sched_plan.cpp
index 0a2134f0a0..03c2373583 100644
--- a/sched/sched_plan.cpp
+++ b/sched/sched_plan.cpp
@@ -147,7 +147,7 @@ int app_plan(SCHEDULER_REQUEST& sreq, char* plan_class, HOST_USAGE& hu) {
         //
         hu.avg_ncpus = .01;
         hu.max_ncpus = .01;
-        hu.flops = .01*sreq.host.p_fpops;
+        hu.flops = sreq.host.p_fpops;
     }
     log_messages.printf(MSG_CRITICAL,
         "Unknown plan class: %s\n", plan_class