diff --git a/fido2/main.c b/fido2/main.c
index 0faa7b1..f290ff8 100644
--- a/fido2/main.c
+++ b/fido2/main.c
@@ -21,58 +21,25 @@
 
 #if !defined(TEST)
 
-bool use_udp = true;
-
-void usage(const char * cmd)
-{
-    fprintf(stderr, "Usage: %s [-b udp|hidg]\n", cmd);
-    fprintf(stderr, "   -b      backing implementation: udp(default) or hidg\n");
-    exit(1);
-}
 
 int main(int argc, char *argv[])
 {
     uint8_t hidmsg[64];
     uint32_t t1 = 0;
-    int opt;
-
-    while ((opt = getopt(argc, argv, "b:")) != -1)
-    {
-        switch (opt)
-        {
-            case 'b':
-                if (strcmp("udp", optarg) == 0)
-                {
-                    use_udp = true;
-                }
-                else if (strcmp("hidg", optarg) == 0)
-                {
-                    use_udp = false;
-                }
-                else
-                {
-                    usage(argv[0]);
-                }
-                break;
-            default:
-                usage(argv[0]);
-                break;
-        }
-    }
 
     set_logging_mask(
 		/*0*/
 		//TAG_GEN|
 		//TAG_MC |
 		//TAG_GA |
-		//TAG_WALLET |
+		TAG_WALLET |
 		TAG_STOR |
 		//TAG_NFC_APDU |
 		TAG_NFC |
 		//TAG_CP |
 		//TAG_CTAP|
 		//TAG_HID|
-		//TAG_U2F|
+		TAG_U2F|
 		//TAG_PARSE |
 		//TAG_TIME|
 		//TAG_DUMP|
@@ -81,14 +48,10 @@ int main(int argc, char *argv[])
 		TAG_ERR
 	);
 
-    device_init();
-
-
+    device_init(argc, argv);
 
     memset(hidmsg,0,sizeof(hidmsg));
 
-    // printf1(TAG_GEN,"recv'ing hid msg \n");
-
 
     while(1)
     {
diff --git a/pc/device.c b/pc/device.c
index a789228..8e2cc10 100644
--- a/pc/device.c
+++ b/pc/device.c
@@ -25,6 +25,8 @@
 
 #define RK_NUM  50
 
+bool use_udp = true;
+
 struct ResidentKeyStore {
     CTAP_residentKey rks[RK_NUM];
 } RK_STORE;
@@ -211,8 +213,44 @@ void int_handler(int i)
     exit(0);
 }
 
-void device_init()
+
+
+void usage(const char * cmd)
 {
+    fprintf(stderr, "Usage: %s [-b udp|hidg]\n", cmd);
+    fprintf(stderr, "   -b      backing implementation: udp(default) or hidg\n");
+    exit(1);
+}
+
+void device_init(int argc, char *argv[])
+{
+
+    int opt;
+
+    while ((opt = getopt(argc, argv, "b:")) != -1)
+    {
+        switch (opt)
+        {
+            case 'b':
+                if (strcmp("udp", optarg) == 0)
+                {
+                    use_udp = true;
+                }
+                else if (strcmp("hidg", optarg) == 0)
+                {
+                    use_udp = false;
+                }
+                else
+                {
+                    usage(argv[0]);
+                }
+                break;
+            default:
+                usage(argv[0]);
+                break;
+        }
+    }
+
     signal(SIGINT, int_handler);
 
     printf1(TAG_GREEN, "Using %s backing\n", use_udp ? "UDP" : "hidg");
diff --git a/targets/stm32l432/src/device.c b/targets/stm32l432/src/device.c
index 2d99774..1ae5297 100644
--- a/targets/stm32l432/src/device.c
+++ b/targets/stm32l432/src/device.c
@@ -107,7 +107,7 @@ void device_reboot()
     NVIC_SystemReset();
 }
 
-void device_init()
+void device_init(int argc, char *argv[])
 {
 
     hw_init(LOW_FREQUENCY);