diff --git a/TODO-Combo.md b/TODO-Combo.md
index 146020ec70..74777ef574 100644
--- a/TODO-Combo.md
+++ b/TODO-Combo.md
@@ -2,9 +2,10 @@
   - [ ] No connection can be established anymore
     - Removing the BT device's bonding (!=pairing) fixes it; nope it doesn't
     - Ruffy logs in BTConnection:163  handler.fail("no connection possible: " + e.getMessage());
+    - When developing (and thus killing/restarting AAPS often) this is trigger more frequently, leaving
+      some ruffy-releated (BT) cache in disarray? Immune to wiping, only repairing seems to work so far
   - [x] Timeout connecting to pump -> crash
   - [ ] Bolus deleted in treatments  (marked invalid?!) is re-added when pump reads history
-  - [ ] Shutdown -> kill idle thread so app can terminate
 - [ ] Tasks
   - [ ] Main
     - [ ] Reading history
@@ -37,9 +38,12 @@
     - [ ] Enable BT if disabled? does dana does this?
     - [ ] Finish and test German translation
     - [ ] No clean startup/shutdown; RuffyScripter is instanciated once, idle disconnect thread never killed
+        - Application shut down is broken with PersistentNotification (never shut down) and WearPlugin -
+          Android logs it as crashed and restarts it, thereby restarting the app (or just keeping it alive,
+          also causes errors with the DB as there were attemtps to open a closed DB instance/ref.
 
 - [ ] v3
-  - [ ] Tasks
+  - [ ] Tasks (this is probably best left to the command-mode people)
     - [ ] Reading TDD
       - [ ] UI for TDDs
     - [ ] Optimize reading full history to pass timestamps of last known records to avoid reading known records
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d758688001..c3d3c410fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -769,11 +769,14 @@
     <string name="combo_pump_state_label">State</string>
     <string name="combo_pump_activity">Activity</string>
     <string name="combo_no_pump_connection">No connection for %s</string>
+    <!-- TODO v2 this is more like 'last command' failed -->
     <string name="combo_connect_attempt_failed">Last connect attempt failed</string>
     <string name="combo_last_connection_time">%s</string>
     <string name="combo_tbr_remaining">%d%% (%d min remaining)</string>
     <string name="combo_last_bolus">%.1f U (%s, %s)</string>
-    <string name="combo_pump_state_disconnected">Pump disconnected</string>
+    <!-- TODO v2 better name, 'disconnected' but may confusing since the loop can be disconnected
+        and technically the pump is disconnected when no command is running -->
+    <string name="combo_pump_state_disconnected">Disconnected</string>
     <string name="combo_pump_state_suspended_due_to_error">Suspended due to error</string>
     <string name="combo_pump_state_suspended_by_user">Suspended by user</string>
     <string name="combo_pump_state_running">Running</string>
@@ -792,7 +795,7 @@
     <string name="combo_bolus_bolus_delivery_failed">Bolus delivery failed. A (partial) bolus might have been delivered. Attempting to update history from pump. Please check the Combo page and bolus again as needed.</string>
     <string name="combo_force_disabled">Unsafe usage: extended or multiwave boluses have been delivered within the last 6 hours or the selected basal rate is not 1. Loop mode has been disabled until 6 hours after the last unsupported bolus or basal rate profile. Only normal boluses are supported in loop mode with basal rate profile 1.</string>
     <string name="bolus_frequency_exceeded">A bolus with the same amount was requested within the last minute. For safety reasons this is disallowed.</string>
-    <string name="combo_pump_state_initializing">Initializing</string>
+    <string name="combo_pump_action_initializing">Initializing</string>
     <string name="combo_pump_connected_now">Now</string>
     <string name="combo_activity_reading_pump_history">Reading pump history</string>
     <string name="pump_history">pump history</string>