diff --git a/checkin_notes b/checkin_notes
index 2da9c7d16a..0cf23f9980 100644
--- a/checkin_notes
+++ b/checkin_notes
@@ -6921,3 +6921,17 @@ Rom    20 Aug 2008
         sample_index.php
     tools/
         project.xml
+
+David  20 Aug 2008
+    - make_project: fix --test_app
+    - fix formatting (no long indents)
+
+    clientgui/
+        AsynchRPC.cpp
+    tools/
+        make_project
+    html/
+        ops/
+            create_forums.php
+        user/
+            team_search.php
diff --git a/clientgui/AsyncRPC.cpp b/clientgui/AsyncRPC.cpp
index 07aacdca4d..04c6707a1a 100755
--- a/clientgui/AsyncRPC.cpp
+++ b/clientgui/AsyncRPC.cpp
@@ -84,7 +84,8 @@ AsyncRPC::~AsyncRPC() {}
 
 
 int AsyncRPC::RPC_Wait(RPC_SELECTOR which_rpc, void *arg1, void *arg2, 
-                            void *arg3, void *arg4, bool hasPriority) {
+    void *arg3, void *arg4, bool hasPriority
+) {
     ASYNC_RPC_REQUEST request;
     int retval = 0;
 
@@ -198,9 +199,10 @@ int RPCThread::ProcessRPCRequest() {
         retval = (m_Doc->rpcClient).get_simple_gui_info(*(SIMPLE_GUI_INFO*)(current_request->arg1));
         break;
     case RPC_GET_SIMPLE_GUI_INFO2:
-        retval = (m_Doc->rpcClient).get_simple_gui_info(*(CC_STATE*)(current_request->arg1), 
-                                                            *(RESULTS*)(current_request->arg2)
-                                                        );
+        retval = (m_Doc->rpcClient).get_simple_gui_info(
+            *(CC_STATE*)(current_request->arg1), 
+            *(RESULTS*)(current_request->arg2)
+        );
         break;
     case RPC_GET_PROJECT_STATUS1:
         if (current_request->exchangeBuf) {
@@ -362,9 +364,10 @@ int RPCThread::ProcessRPCRequest() {
         retval = (m_Doc->rpcClient).get_global_prefs_working(*(std::string*)(current_request->arg1));
         break;
     case RPC_GET_GLOBAL_PREFS_WORKING_STRUCT:
-        retval = (m_Doc->rpcClient).get_global_prefs_working_struct(*(GLOBAL_PREFS*)(current_request->arg1), 
-                                                        *(GLOBAL_PREFS_MASK*)(current_request->arg2)
-                                                    );
+        retval = (m_Doc->rpcClient).get_global_prefs_working_struct(
+            *(GLOBAL_PREFS*)(current_request->arg1), 
+            *(GLOBAL_PREFS_MASK*)(current_request->arg2)
+        );
         break;
     case RPC_GET_GLOBAL_PREFS_OVERRIDE:
         retval = (m_Doc->rpcClient).get_global_prefs_override(*(std::string*)(current_request->arg1));
@@ -373,14 +376,16 @@ int RPCThread::ProcessRPCRequest() {
          retval = (m_Doc->rpcClient).set_global_prefs_override(*(std::string*)(current_request->arg1));
         break;
     case RPC_GET_GLOBAL_PREFS_OVERRIDE_STRUCT:
-        retval = (m_Doc->rpcClient).get_global_prefs_override_struct(*(GLOBAL_PREFS*)(current_request->arg1), 
-                                                        *(GLOBAL_PREFS_MASK*)(current_request->arg2)
-                                                    );
+        retval = (m_Doc->rpcClient).get_global_prefs_override_struct(
+            *(GLOBAL_PREFS*)(current_request->arg1), 
+            *(GLOBAL_PREFS_MASK*)(current_request->arg2)
+        );
         break;
     case RPC_SET_GLOBAL_PREFS_OVERRIDE_STRUCT:
-        retval = (m_Doc->rpcClient).set_global_prefs_override_struct(*(GLOBAL_PREFS*)(current_request->arg1), 
-                                                        *(GLOBAL_PREFS_MASK*)(current_request->arg2)
-                                                    );
+        retval = (m_Doc->rpcClient).set_global_prefs_override_struct(
+            *(GLOBAL_PREFS*)(current_request->arg1), 
+            *(GLOBAL_PREFS_MASK*)(current_request->arg2)
+        );
         break;
     case RPC_SET_DEBTS:
         retval = (m_Doc->rpcClient).set_debts(*(std::vector<PROJECT>*)(current_request->arg1));
@@ -817,4 +822,4 @@ void CMainDocument::TestAsyncRPC() {
     wxLogMessage(wxT("rpcClient.get_all_projects_list returned %d\n"), rpc_result);
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/html/ops/create_forums.php b/html/ops/create_forums.php
index fd9867fe07..c779bfb8a5 100644
--- a/html/ops/create_forums.php
+++ b/html/ops/create_forums.php
@@ -16,7 +16,9 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with BOINC.  If not, see <http://www.gnu.org/licenses/>.
 
+// Create message boards.
 // RUN THIS AS A SCRIPT, NOT VIA A BROWSER.
+// TODO: rewrite this using the DB abstraction layer
 // First, edit the set of forums (below) and remove the following line
 exit();
 
@@ -61,6 +63,6 @@ create_forum($catid, 3, "Getting started", "Creating your account");
 create_forum($catid, 4, "Preferences", "Using preferences");
 create_forum($catid, 5, "Wish list", "What new features would you like to see?");
 create_forum($catid, 6, "Web site", "Issues involving this web site");
-admin_page_tail();
+
 $cvs_version_tracker[]="\$Id$";  //Generated automatically - do not edit
 ?>
diff --git a/html/user/team_search.php b/html/user/team_search.php
index 0e5c55ea00..85ac22c13d 100644
--- a/html/user/team_search.php
+++ b/html/user/team_search.php
@@ -149,7 +149,7 @@ function search($params) {
 $user = get_logged_in_user(false);
 if (isset($_GET['submit'])) {
     $params = null;
-    $params->keywords = get_str('keywords');
+    $params->keywords = get_str('keywords', true);
     $params->country = $_GET['country'];
     $params->type = $_GET['type'];
     $params->active = get_str('active', true);
diff --git a/tools/make_project b/tools/make_project
index fc9de63c55..e95476fb47 100755
--- a/tools/make_project
+++ b/tools/make_project
@@ -289,7 +289,7 @@ if options.test_app:
     filepath = versdir+'/'+dname
     os.mkdir(ucdir)
     os.mkdir(versdir)
-    shutil.copy('../../boinc_samples/example_app/uc2', filepath)
+    shutil.copy('../samples/example_app/uc2', filepath)
     shutil.copy('uc_result', proot+'/templates/')
     shutil.copy('uc_wu', proot+'/templates/')
     shutil.copy('../tools/create_work_example', proot+'/bin/')