diff --git a/app/release/app-release-4.0.0b.apk b/app/release/app-release-4.0.0b.apk
new file mode 100644
index 0000000..089b419
Binary files /dev/null and b/app/release/app-release-4.0.0b.apk differ
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index eb86d9a..4202ef2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="uk.org.openseizuredetector"
     android:versionCode="92"
-    android:versionName="4.0.0a">
+    android:versionName="4.0.0b">
     <!-- android:allowBackup="false" -->
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
diff --git a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java
index 2115441..35e3804 100644
--- a/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java
+++ b/app/src/main/java/uk/org/openseizuredetector/OsdUtil.java
@@ -137,8 +137,8 @@ public class OsdUtil implements ActivityCompat.OnRequestPermissionsResultCallbac
         try {
             mLogAlarms = SP.getBoolean("LogAlarms", true);
             Log.v(TAG, "updatePrefs() - mLogAlarms = " + mLogAlarms);
-            mLogData = SP.getBoolean("LogData", false);
-            Log.v(TAG, "updatePrefs() - mLogData = " + mLogData);
+            mLogData = SP.getBoolean("LogData", true);
+            Log.v(TAG, "OsdUtil.updatePrefs() - mLogData = " + mLogData);
             mLogSystem = SP.getBoolean("LogSystem", true);
             Log.v(TAG, "updatePrefs() - mLogSystem = " + mLogSystem);
 
diff --git a/app/src/main/java/uk/org/openseizuredetector/SdServer.java b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
index d782b42..164a701 100644
--- a/app/src/main/java/uk/org/openseizuredetector/SdServer.java
+++ b/app/src/main/java/uk/org/openseizuredetector/SdServer.java
@@ -1211,7 +1211,7 @@ public class SdServer extends Service implements SdDataReceiver {
             Log.v(TAG, "updatePrefs() - mLogAlarms = " + mLogAlarms);
             mUtil.writeToSysLogFile("updatePrefs() - mLogAlarms = " + mLogAlarms);
             mLogData = SP.getBoolean("LogData", true);
-            Log.v(TAG, "updatePrefs() - mLogData = " + mLogData);
+            Log.v(TAG, "SdServer.updatePrefs() - mLogData = " + mLogData);
             mUtil.writeToSysLogFile( "updatePrefs() - mLogData = " + mLogData);
             mLogDataRemote = SP.getBoolean("LogDataRemote", false);
             Log.v(TAG, "updatePrefs() - mLogDataRemote = " + mLogDataRemote);
@@ -1589,9 +1589,9 @@ public class SdServer extends Service implements SdDataReceiver {
         if (mEventsTimer != null) {
             Log.v(TAG, "stopEventsTimer(): timer already running - cancelling it.");
             mUtil.writeToSysLogFile("stopEventsTimer() - stopping timer");
+            mEventsTimer.mIsRunning = false;
             mEventsTimer.cancel();
             mEventsTimer = null;
-            mEventsTimer.mIsRunning = false;
         } else {
             Log.v(TAG, "stopEventsTimer(): timer not running - not doing anything.");
         }
diff --git a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
index 10b5a2d..e5842aa 100644
--- a/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
+++ b/app/src/main/java/uk/org/openseizuredetector/StartupActivity.java
@@ -86,6 +86,15 @@ public class StartupActivity extends Activity {
                 .addCommaSeparatedEmailAddresses("crashreports@openseizuredetector.org.uk,")
                 .build();
 
+        // Read the default settings from the xml preferences files, so we do
+        // not have to use the hard coded ones in the java files.
+        PreferenceManager.setDefaultValues(this, R.xml.alarm_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.seizure_detector_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.network_passive_datasource_prefs, true);
+        PreferenceManager.setDefaultValues(this, R.xml.logging_prefs, true);
 
         mHandler = new Handler();
         mUtil = new OsdUtil(getApplicationContext(), mHandler);
@@ -100,15 +109,6 @@ public class StartupActivity extends Activity {
 
         setContentView(R.layout.startup_activity);
 
-        // Read the default settings from the xml preferences files, so we do
-        // not have to use the hard coded ones in the java files.
-        PreferenceManager.setDefaultValues(this, R.xml.alarm_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.general_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.network_datasource_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.pebble_datasource_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.seizure_detector_prefs, true);
-        PreferenceManager.setDefaultValues(this, R.xml.network_passive_datasource_prefs, true);
-
 
         Button b;
 
diff --git a/app/src/main/res/xml/alarm_prefs.xml b/app/src/main/res/xml/alarm_prefs.xml
index 755e59c..bcae6de 100644
--- a/app/src/main/res/xml/alarm_prefs.xml
+++ b/app/src/main/res/xml/alarm_prefs.xml
@@ -70,6 +70,7 @@
             android:title="Enable Phone Call Alarm" />
     </PreferenceCategory>
 -->
+    <!--
     <PreferenceCategory android:title="@string/AlarmLoggingTitle">
         <CheckBoxPreference
             android:defaultValue="true"
@@ -82,4 +83,5 @@
             android:summary="@string/log_data_summary"
             android:title="@string/log_data_title"/>
     </PreferenceCategory>
+    -->
 </PreferenceScreen>
diff --git a/app/src/main/res/xml/general_prefs.xml b/app/src/main/res/xml/general_prefs.xml
index 42fb8c3..8860412 100644
--- a/app/src/main/res/xml/general_prefs.xml
+++ b/app/src/main/res/xml/general_prefs.xml
@@ -6,7 +6,7 @@
         android:summary="@string/select_datasource_summary"
         android:entries="@array/datasource_list"
         android:entryValues="@array/datasource_list_values"
-        android:defaultValue="Garmin"
+        android:defaultValue="Phone"
         android:dialogTitle="@string/select_datasource_title" />
     <Preference
         android:key="SelectBLEDevice"
@@ -14,6 +14,7 @@
         android:summary="@string/select_ble_device_desc"
         android:widgetLayout="@layout/pref_select_ble_device_button"
         />
+    <!--
     <CheckBoxPreference
         android:defaultValue="true"
         android:key="LogAlarms"
@@ -55,6 +56,8 @@
         android:key="OSDUrl"
         android:summary="@string/remote_url_summary"
         android:title="@string/remote_url_title" />
+        -->
+
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="PreventSleep"
diff --git a/app/src/main/res/xml/logging_prefs.xml b/app/src/main/res/xml/logging_prefs.xml
index 483d19b..a693448 100644
--- a/app/src/main/res/xml/logging_prefs.xml
+++ b/app/src/main/res/xml/logging_prefs.xml
@@ -16,7 +16,7 @@
         android:summary="@string/eventDurationSummary"
         android:title="@string/eventDurationTitle" />
     <CheckBoxPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="AutoPruneDb"
         android:summary="@string/AutoPruneDbSummary"
         android:title="@string/AutoPruneDbTitle" />
@@ -27,7 +27,7 @@
         android:title="@string/dataRetentionPeriodTitle" />
 
     <CheckBoxPreference
-        android:defaultValue="false"
+        android:defaultValue="true"
         android:key="LogDataRemote"
         android:summary="@string/log_data_remote_summary"
         android:title="@string/log_data_remote_title" />