diff --git a/MyTracks/res/layout/about.xml b/MyTracks/res/layout/about.xml
index 753d860e8..0870154b7 100644
--- a/MyTracks/res/layout/about.xml
+++ b/MyTracks/res/layout/about.xml
@@ -41,8 +41,7 @@ limitations under the License.
     </LinearLayout>
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -86,8 +85,7 @@ limitations under the License.
     </LinearLayout>
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -106,8 +104,7 @@ limitations under the License.
       android:textSize="20sp" />
   </TableRow>
 
-  <View
-    android:layout_height="2dip" />
+  <View android:layout_height="2dip" />
 
   <TableRow>
     <TextView
@@ -126,7 +123,25 @@ limitations under the License.
       android:textSize="18sp" />
   </TableRow>
 
-  <View
-    android:layout_height="4dip" />
+  <View android:layout_height="2dip" />
+  
+  <TableRow>
+    <TextView
+      android:paddingLeft="10dip"
+      android:paddingRight="10dip"
+      android:layout_column="1"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy"
+      android:textSize="20sp" />
+    <TextView
+      android:autoLink="web"
+      android:layout_height="wrap_content"
+      android:layout_width="wrap_content"
+      android:text="@string/about_privacy_weburl"
+      android:textSize="18sp" />
+  </TableRow>
+  
+  <View android:layout_height="4dip" />
 
 </TableLayout>
diff --git a/MyTracks/res/values/do_not_translate.xml b/MyTracks/res/values/do_not_translate.xml
index 32095d881..861738bf7 100644
--- a/MyTracks/res/values/do_not_translate.xml
+++ b/MyTracks/res/values/do_not_translate.xml
@@ -21,6 +21,7 @@ limitations under the License.
   <!-- About Dialog -->
   <string name="about_googlegroups">mytracks@googlegroups.com</string>
   <string name="about_weburl">mytracks.appspot.com</string>
+  <string name="about_privacy_weburl">m.google.com/privacy</string>
   <string name="about_copyright_message">Copyright 2009 Google Inc.</string>
   <string name="about_bart">Bartlomiej Niechwiej</string>
   <string name="about_dylan">Dylan Casey</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index 487afee53..a838c30c1 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -104,6 +104,7 @@ limitations under the License.
   <string name="error">Error</string>
   <string name="success">Success</string>
   <string name="waypoint">Waypoint</string>
+  <string name="license">License</string>
 
   <!-- Placemark labels for start and end of track -->
   <string name="start">(Start)</string>
@@ -378,8 +379,8 @@ limitations under the License.
   <string name="help">Help</string>
   <string name="about_team">Team:</string>
   <string name="about_version">Version:</string>
-  <string name="about_email">Support</string>
   <string name="about_support">Support:</string>
+  <string name="about_privacy">Privacy:</string>
 
   <!-- Send to Google -->
   <string name="sendtogoogle_title">Send to...</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/Eula.java b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
index 4471d93fc..aed5a40a0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/Eula.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/Eula.java
@@ -21,38 +21,37 @@ import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
 
 /**
- * Displays an EULA ("End User License Agreement") that the user has to accept
- * before using the application. Your application should call
- * {@link Eula#showEula(android.app.Activity)} in the onCreate() method of the
- * first activity. If the user accepts the EULA, it will never be shown again.
- * If the user refuses, {@link android.app.Activity#finish()} is invoked on your
- * activity.
+ * This class handles display of EULAs ("End User License Agreements") to the
+ * user.
  */
 class Eula {
   private static final String PREFERENCE_EULA_ACCEPTED = "eula.accepted";
   private static final String PREFERENCES_EULA = "eula";
 
+  private Eula() {}
+
   /**
    * Displays the EULA if necessary. This method should be called from the
-   * onCreate() method of your main Activity.
+   * onCreate() method of your main Activity.  If the user accepts, the EULA
+   * will never be displayed again.  If the user refuses, the activity will
+   * finish (exit).
    *
    * @param activity The Activity to finish if the user rejects the EULA
    */
-  static void showEula(final Activity activity) {
+  static void showEulaRequireAcceptance(final Activity activity) {
     final SharedPreferences preferences =
         activity.getSharedPreferences(PREFERENCES_EULA, Activity.MODE_PRIVATE);
     if (preferences.getBoolean(PREFERENCE_EULA_ACCEPTED, false)) {
       return;
     }
 
-    final AlertDialog.Builder builder = new AlertDialog.Builder(activity);
-    builder.setTitle(R.string.eula_title);
-    builder.setCancelable(true);
+    final AlertDialog.Builder builder = initDialog(activity);
     builder.setPositiveButton(R.string.accept,
         new DialogInterface.OnClickListener() {
           @Override
@@ -73,10 +72,28 @@ class Eula {
         refuse(activity);
       }
     });
-    builder.setMessage(ResourceUtils.readFile(activity, R.raw.eula));
     builder.show();
   }
 
+  /**
+   * Display the EULA to the user in an informational context.  They won't be
+   * given the choice of accepting or declining the EULA -- we're simply
+   * displaying it for them to read.
+   */
+  static void showEula(Context context) {
+    AlertDialog.Builder builder = initDialog(context);
+    builder.setPositiveButton(R.string.ok, null);
+    builder.show();
+  }
+  
+  private static AlertDialog.Builder initDialog(Context context) {
+    AlertDialog.Builder builder = new AlertDialog.Builder(context);
+    builder.setCancelable(true);
+    builder.setTitle(R.string.eula_title);
+    builder.setMessage(ResourceUtils.readFile(context, R.raw.eula));
+    return builder;
+  }
+
   private static void accept(Activity activity, SharedPreferences preferences) {
     ApiFeatures.getInstance().getApiPlatformAdapter().applyPreferenceChanges(
         preferences.edit().putBoolean(PREFERENCE_EULA_ACCEPTED, true));
@@ -87,7 +104,4 @@ class Eula {
   private static void refuse(Activity activity) {
     activity.finish();
   }
-
-  private Eula() {
-  }
 }
diff --git a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
index 3a276f86e..1eb86831a 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ExportAllTracks.java
@@ -46,6 +46,7 @@ public class ExportAllTracks {
   public static final int GPX_OPTION_INDEX = 0;
   public static final int KML_OPTION_INDEX = 1;
   public static final int CSV_OPTION_INDEX = 2;
+  public static final int TCX_OPTION_INDEX = 3;
 
   private final Activity activity;
   private WakeLock wakeLock;
@@ -67,6 +68,11 @@ public class ExportAllTracks {
             case CSV_OPTION_INDEX:
               format = TrackFileFormat.CSV;
               break;
+            case TCX_OPTION_INDEX:
+              format = TrackFileFormat.TCX;
+              break;
+            default:
+              Log.w(MyTracksConstants.TAG, "Unknown export format: " + which);
           }
         }
       };
diff --git a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
index a8a39bec6..670072310 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MyTracks.java
@@ -314,7 +314,7 @@ public class MyTracks extends TabActivity implements OnTouchListener,
     }
 
     // This will show the eula until the user accepts or quits the app.
-    Eula.showEula(this);
+    Eula.showEulaRequireAcceptance(this);
 
     // Check if we got invoked via the VIEW intent:
     Intent intent = getIntent();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 42edd66f6..cfbab6d73 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -19,6 +19,7 @@ import com.google.android.maps.mytracks.R;
 
 import android.app.Activity;
 import android.app.AlertDialog;
+import android.content.DialogInterface;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -74,6 +75,12 @@ public class WelcomeActivity extends Activity {
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
     builder.setPositiveButton(R.string.ok, null);
+    builder.setNeutralButton(R.string.license, new DialogInterface.OnClickListener() {
+      @Override 
+      public void onClick(DialogInterface dialog, int which) {
+        Eula.showEula(WelcomeActivity.this);
+      }
+    });
     builder.setIcon(R.drawable.arrow_icon);
     AlertDialog dialog = builder.create();
     dialog.show();
diff --git a/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/SignalStrengthService.java b/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/SignalStrengthService.java
index 210fefe02..8a9cf4cd3 100644
--- a/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/SignalStrengthService.java
+++ b/SignalStrengthSampler/src/com/google/android/apps/mytracks/signalstrength/SignalStrengthService.java
@@ -19,7 +19,6 @@ import static com.google.android.apps.mytracks.signalstrength.SignalStrengthCons
 
 import com.google.android.apps.mytracks.content.MyTracksProviderUtils;
 import com.google.android.apps.mytracks.content.MyTracksProviderUtilsImpl;
-import com.google.android.apps.mytracks.content.Waypoint;
 import com.google.android.apps.mytracks.content.WaypointCreationRequest;
 import com.google.android.apps.mytracks.services.ITrackRecordingService;
 import com.google.android.apps.mytracks.signalstrength.SignalStrengthListener.SignalStrengthCallback;
@@ -56,7 +55,6 @@ public class SignalStrengthService extends Service
   private ITrackRecordingService mytracksService;
   private long lastSamplingTime;
   private long samplingPeriod;
-  private MyTracksProviderUtils utils;
 
   @Override
   public void onCreate() {
@@ -67,7 +65,6 @@ public class SignalStrengthService extends Service
         getString(R.string.mytracks_service_class));
     preferences = PreferenceManager.getDefaultSharedPreferences(this);
     signalListenerFactory = new SignalStrengthListenerFactory();
-    utils = new MyTracksProviderUtilsImpl(this.getContentResolver());
   }
 
   @Override