diff --git a/astrid/astrid.launch b/astrid/astrid.launch
index 6a8eb7356..f9929e151 100644
--- a/astrid/astrid.launch
+++ b/astrid/astrid.launch
@@ -4,7 +4,7 @@
 <booleanAttribute key="ch.zork.quicklaunch" value="true"/>
 <stringAttribute key="ch.zork.quicklaunch.icon" value="14.gif"/>
 <intAttribute key="ch.zork.quicklaunch.index" value="0"/>
-<stringAttribute key="ch.zork.quicklaunch.mode" value="run"/>
+<stringAttribute key="ch.zork.quicklaunch.mode" value="debug"/>
 <intAttribute key="com.android.ide.eclipse.adt.action" value="0"/>
 <stringAttribute key="com.android.ide.eclipse.adt.avd" value="android-22"/>
 <stringAttribute key="com.android.ide.eclipse.adt.commandline" value="-scale 0.7"/>
diff --git a/astrid/src/com/todoroo/astrid/dao/Database.java b/astrid/src/com/todoroo/astrid/dao/Database.java
index 69a53ac08..bdeeecec7 100644
--- a/astrid/src/com/todoroo/astrid/dao/Database.java
+++ b/astrid/src/com/todoroo/astrid/dao/Database.java
@@ -44,7 +44,7 @@ public final class Database extends AbstractDatabase {
     // --- implementation
 
     @Override
-    protected String getName() {
+    public String getName() {
         return NAME;
     }
 
diff --git a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
index 7968a693e..2d94b296d 100644
--- a/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
+++ b/astrid/src/com/todoroo/astrid/service/Astrid2To3UpgradeHelper.java
@@ -1,5 +1,6 @@
 package com.todoroo.astrid.service;
 
+import java.util.Arrays;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map.Entry;
@@ -11,8 +12,8 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
-import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.database.sqlite.SQLiteOpenHelper;
+import android.database.sqlite.SQLiteDatabase.CursorFactory;
 import android.util.Log;
 
 import com.timsu.astrid.R;
@@ -103,6 +104,10 @@ public class Astrid2To3UpgradeHelper {
     public void upgrade2To3() {
         Context context = ContextManager.getContext();
 
+        // if there's already a database table, skip
+        if(Arrays.asList(context.databaseList()).contains(database.getName()))
+            return;
+
         // pop up a progress dialog
         ProgressDialog dialog = null;
         if(context instanceof Activity)
diff --git a/astrid/src/com/todoroo/astrid/service/MetadataService.java b/astrid/src/com/todoroo/astrid/service/MetadataService.java
index ced476eba..51a03e42d 100644
--- a/astrid/src/com/todoroo/astrid/service/MetadataService.java
+++ b/astrid/src/com/todoroo/astrid/service/MetadataService.java
@@ -1,5 +1,7 @@
 package com.todoroo.astrid.service;
 
+import android.util.Log;
+
 import com.todoroo.andlib.data.Property;
 import com.todoroo.andlib.data.TodorooCursor;
 import com.todoroo.andlib.data.Property.CountProperty;
diff --git a/astrid/src/com/todoroo/astrid/service/UpgradeService.java b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
index 28ebaf433..c2b14a78e 100644
--- a/astrid/src/com/todoroo/astrid/service/UpgradeService.java
+++ b/astrid/src/com/todoroo/astrid/service/UpgradeService.java
@@ -65,9 +65,7 @@ public final class UpgradeService {
             });
         if(from <= 134)
             newVersionString(changeLog, "3.0.0 (?/??/10)", new String[] {
-                    "Astrid is brand new under the hood! You won't see many " +
-                        "changes yet but Astrid received a much-needed makeover " +
-                        "that allows it to do a lot of new tricks. Stay tuned!",
+                    "Astrid is brand new inside and out!",
             });
 
         if(changeLog.length() == 0)