diff --git a/.idea/dictionaries/kevinh.xml b/.idea/dictionaries/kevinh.xml
new file mode 100644
index 000000000..9303fb6c1
--- /dev/null
+++ b/.idea/dictionaries/kevinh.xml
@@ -0,0 +1,8 @@
+<component name="ProjectDictionaryState">
+  <dictionary name="kevinh">
+    <words>
+      <w>geeksville</w>
+      <w>meshtastic</w>
+    </words>
+  </dictionary>
+</component>
\ No newline at end of file
diff --git a/README.md b/README.md
index f0b2a4a51..2be330392 100644
--- a/README.md
+++ b/README.md
@@ -6,6 +6,7 @@ Questions? kevinh@geeksville.com
 
 ## Analytics setup
 
+analytics is currently on, before beta is over I'll make it optional
 on dev devices
 adb shell setprop debug.firebase.analytics.app com.geeeksville.mesh
 
diff --git a/TODO.md b/TODO.md
index c471038ad..2008e5807 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,8 +1,10 @@
 
 * test reg reading/writing directly via bt to device
 * fix bluetooth update
-* add broadcasters for use by signal (node changes and packet received)
+* get signal running under debugger
+* DONE add broadcasters for use by signal (node changes and packet received)
 * make test implementation of server (doesn't use bluetooth)
+* make a test client of the android service
 * add real messaging code/protobufs
 * use https://codelabs.developers.google.com/codelabs/jetpack-compose-basics/#4 to show service state
 * connect to bluetooth device automatically using minimum power
@@ -18,10 +20,9 @@ https://jpa.kapsi.fi/nanopb/docs/
 nanopb binaries available here: https://jpa.kapsi.fi/nanopb/download/ use nanopb 0.4.0
 # Medium priority
 
-* remove secret google settings json before open sourcing
+* remove mixpanel analytics
 * require user auth to pair with the device (i.e. press button on device to allow a new phone to pair with it).
 Don't leave device discoverable.  Don't let unpaired users do thing with device
-
 * remove example code boilerplate from the service
 
 
diff --git a/app/google-services.json b/app/google-services.json
index 525c238a8..2d64d34c3 100644
--- a/app/google-services.json
+++ b/app/google-services.json
@@ -8,7 +8,7 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:484268767777:android:341f38a29ecbe9b0334160",
+        "mobilesdk_app_id": "1:484268767777:android:cfd54d15b56763ad334160",
         "android_client_info": {
           "package_name": "com.geeksville.mesh"
         }
@@ -34,6 +34,35 @@
           ]
         }
       }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:484268767777:android:341f38a29ecbe9b0334160",
+        "android_client_info": {
+          "package_name": "com.geeksville.meshutil"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "484268767777-hqiigdj947ih0otlcs4snj347g4hhgbj.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyDP5YQqMCXx08xLFm3sIK9kDcIxI7qwL-c"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "484268767777-hqiigdj947ih0otlcs4snj347g4hhgbj.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
+        }
+      }
     }
   ],
   "configuration_version": "1"
diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 0d27eff4b..bde59f719 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -81,7 +81,7 @@ class MainActivity : AppCompatActivity(), Logging {
     fun composeView() {
         MaterialTheme {
             Column {
-                Text(text = "MeshUtil Ugly UI", modifier = Spacing(8.dp))
+                Text(text = "Meshtastic Ugly UI", modifier = Spacing(8.dp))
 
                 Button(text = "Start scan",
                     onClick = {
diff --git a/app/src/main/java/com/geeksville/mesh/MeshService.kt b/app/src/main/java/com/geeksville/mesh/MeshService.kt
index a2155a456..b587aa4de 100644
--- a/app/src/main/java/com/geeksville/mesh/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/MeshService.kt
@@ -10,7 +10,7 @@ class MeshService : Service(), Logging {
     val prefix = "com.geeksville.mesh"
 
     /*
-    see com.geeksville.com.geeeksville.mesh broadcast intents
+    see com.geeksville.mesh broadcast intents
     // RECEIVED_OPAQUE  for data received from other nodes
     // NODE_CHANGE  for new IDs appearing or disappearing
     // CONNECTION_CHANGED for losing/gaining connection to the packet radio
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8dcfe0359..14f0f21d7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
 <resources>
-    <string name="app_name">Mesh Util</string>
+    <string name="app_name">Meshtastic</string>
     <string name="action_settings">Settings</string>
 </resources>