diff --git a/src/meshcore_cli/meshcore_cli.py b/src/meshcore_cli/meshcore_cli.py
index a3b915a..dc3f207 100644
--- a/src/meshcore_cli/meshcore_cli.py
+++ b/src/meshcore_cli/meshcore_cli.py
@@ -220,16 +220,32 @@ def make_completion_dict(contacts, to=None):
             "cmd" : contact_list,
             "req_status" : contact_list,
             "logout" : contact_list,
-            "set" : {"pin" : None, "radio" : None, "tuning" : None, "tx" : None, 
-                    "name" : None, "lat" : None, "lon" : None, "coords" : None, 
+            "set" : {
+                    "name" : None, 
+                    "pin" : None, 
+                    "radio" : {",,,":None, "f,bw,sf,cr":None}, 
+                    "tx" : None, 
+                    "tuning" : {",", "af,tx_d"}, 
+                    "lat" : None, 
+                    "lon" : None, 
+                    "coords" : None, 
                     "print_snr" : {"on":None, "off": None},
                     "json_msgs" : {"on":None, "off": None},
                     "color" : {"on":None, "off":None},
                     "print_name" : {"on":None, "off":None},
-                    "classic_prompt" : {"on" : None, "off":None}},
-            "get" : {"name" : None, "bat" : None, "coords" : None, "radio" : None, 
-                    "tx" : None, "print_snr" : None, "json_msgs":None, "color":None,
-                    "print_name":None, "classic_prompt":None},
+                    "classic_prompt" : {"on" : None, "off":None},
+                    },
+            "get" : {"name" : None, 
+                     "bat" : None, 
+                     "radio" : None, 
+                     "tx" : None, 
+                     "coords" : None, 
+                     "print_snr" : None, 
+                     "json_msgs":None, 
+                     "color":None,
+                     "print_name":None, 
+                     "classic_prompt":None,
+                     },
         })
     else :
         completion_list.update({
@@ -279,7 +295,7 @@ def make_completion_dict(contacts, to=None):
                          "lon" : None, 
                          },
                 "set" : {"name" : None, 
-                         "radio" : None, 
+                         "radio" : {",,,":None, "f,bw,sf,cr": None}, 
                          "freq" : None, 
                          "tx" : None, 
                          "af": None,