diff --git a/client/plugins/controltips/index.js b/client/plugins/controltips/index.js
index 6874f995..4acea1ed 100644
--- a/client/plugins/controltips/index.js
+++ b/client/plugins/controltips/index.js
@@ -71,6 +71,9 @@ class ControlTipsPlugin {
             }
             __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
         });
+        document.addEventListener("mouseup", (ev) => {
+            __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
+        });
         __classPrivateFieldGet(this, _ControlTipsPlugin_instances, "m", _ControlTipsPlugin_updateTips).call(this);
         __classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getMap().addVisibilityOption(SHOW_CONTROL_TIPS, true);
         return true;
@@ -135,21 +138,27 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
                     "showIfUnitSelected": true,
                     "unitsMustBeControlled": true
                 },
-                {
-                    "key": "CTRL+Mouse2",
-                    "action": "Add waypoint",
-                    "showIfUnitSelected": true,
-                    "showIfHoveringOverAirbase": false,
-                    "unitsMustBeControlled": true
-                },
                 {
                     "key": `Mouse2 (hold)`,
-                    "action": `Point operations`,
+                    "action": `Interact (ground)`,
                     "showIfUnitSelected": true,
                     "showIfHoveringOverAirbase": false,
                     "showIfHoveringOverUnit": false,
                     "unitsMustBeControlled": true
                 },
+                {
+                    "key": `Shift`,
+                    "action": "<em>  in formation...</em>",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": "CTRL",
+                    "action": "<em>  ... more</em>",
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "unitsMustBeControlled": true
+                },
                 {
                     "key": "CTRL",
                     "action": " Pin tool",
@@ -166,18 +175,12 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
                     "unitsMustBeControlled": true
                 },
                 {
-                    "key": `Delete`,
-                    "action": `Delete unit`,
-                    "showIfHoveringOverAirbase": false,
-                    "showIfUnitSelected": true
-                },
-                {
-                    "key": `mouse1`,
+                    "key": `Mouse1`,
                     "action": "Toggle Blue/Red",
                     "mouseoverSelector": "#coalition-switch .ol-switch-fill"
                 },
                 {
-                    "key": `mouse2`,
+                    "key": `Mouse2`,
                     "action": "Set Neutral",
                     "mouseoverSelector": "#coalition-switch .ol-switch-fill"
                 }
@@ -204,15 +207,35 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
                     "key": `Mouse2`,
                     "action": `Add waypoint`,
                     "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": false,
                     "showIfUnitSelected": true,
                     "unitsMustBeControlled": true
                 },
                 {
                     "key": `Mouse2`,
-                    "action": `Airbase menu`,
+                    "action": `Interact (airbase)`,
                     "showIfHoveringOverAirbase": true,
                     "showIfUnitSelected": true,
                     "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": `Interact (unit)`,
+                    "showIfHoveringOverAirbase": false,
+                    "showIfHoveringOverUnit": true,
+                    "showIfUnitSelected": true,
+                    "unitsMustBeControlled": true
+                },
+                {
+                    "key": `Shift`,
+                    "action": "<em>  in formation...</em>",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": `[Num 1-9]`,
+                    "action": "Set hotgroup",
+                    "showIfUnitSelected": true
                 }
             ]
         },
@@ -220,8 +243,35 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
             "keys": ["ShiftLeft"],
             "tips": [
                 {
-                    "key": `mouse1+drag`,
-                    "action": "Box select"
+                    "key": `Mouse1+drag`,
+                    "action": "Box select",
+                    "showIfUnitSelected": false
+                },
+                {
+                    "key": `Mouse2`,
+                    "action": "Set first formation waypoint",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2
+                },
+                {
+                    "key": "CTRL",
+                    "action": "<em>  ... more</em>",
+                    "minSelectedUnits": 2,
+                    "showIfUnitSelected": true,
+                    "showIfHoveringOverAirbase": false,
+                    "unitsMustBeControlled": true
+                }
+            ]
+        },
+        {
+            "keys": ["ControlLeft", "ShiftLeft"],
+            "tips": [
+                {
+                    "key": `Mouse2`,
+                    "action": "Add formation waypoint",
+                    "showIfUnitSelected": true,
+                    "minSelectedUnits": 2,
+                    "unitsMustBeControlled": true
                 }
             ]
         }
@@ -230,11 +280,13 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
     const element = this.getElement();
     element.innerHTML = "";
     let numSelectedUnits = 0;
+    let numSelectedControlledUnits = 0;
     let unitSelectionContainsControlled = false;
     if (__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager()) {
         let selectedUnits = Object.values(__classPrivateFieldGet(this, _ControlTipsPlugin_app, "f").getUnitsManager().getSelectedUnits());
         numSelectedUnits = selectedUnits.length;
-        unitSelectionContainsControlled = selectedUnits.some((unit) => unit.getControlled());
+        numSelectedControlledUnits = selectedUnits.filter((unit) => unit.getControlled()).length;
+        unitSelectionContainsControlled = numSelectedControlledUnits > 0;
     }
     const tipsIncludesActiveMouseover = (currentCombo.tips.some((tip) => {
         if (!tip.mouseoverSelector) {
@@ -256,6 +308,9 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
             if (tip.unitsMustBeControlled === true && unitSelectionContainsControlled === false) {
                 return false;
             }
+            if (typeof tip.minSelectedUnits === "number" && numSelectedControlledUnits < tip.minSelectedUnits) {
+                return false;
+            }
         }
         if (numSelectedUnits === 0 && tip.showIfUnitSelected === true) {
             return false;
@@ -276,8 +331,6 @@ _ControlTipsPlugin_element = new WeakMap(), _ControlTipsPlugin_app = new WeakMap
         if (!tipsIncludesActiveMouseover && typeof tip.mouseoverSelector === "string") {
             return false;
         }
-        return true;
-    }).forEach((tip) => {
         element.innerHTML += `<div><span class="key">${tip.key}</span><span class="action">${tip.action}</span></div>`;
     });
 };
diff --git a/client/plugins/controltips/src/controltipsplugin.ts b/client/plugins/controltips/src/controltipsplugin.ts
index bcfa1506..5977d9e3 100644
--- a/client/plugins/controltips/src/controltipsplugin.ts
+++ b/client/plugins/controltips/src/controltipsplugin.ts
@@ -234,6 +234,11 @@ export class ControlTipsPlugin implements OlympusPlugin {
                         "action": "<em>  in formation...</em>",
                         "showIfUnitSelected": true,
                         "minSelectedUnits": 2
+                    },
+                    {
+                        "key": `[Num 1-9]`,
+                        "action": "Set hotgroup",
+                        "showIfUnitSelected": true
                     }
                 ]
             },
@@ -258,7 +263,7 @@ export class ControlTipsPlugin implements OlympusPlugin {
                         "showIfUnitSelected": true,
                         "showIfHoveringOverAirbase": false,
                         "unitsMustBeControlled": true
-                    },
+                    }
                 ]
             },
             {