diff --git a/client/luascripts/hf_mf_keycheck.lua b/client/luascripts/hf_mf_keycheck.lua
index 29eb46072..53a003ebc 100644
--- a/client/luascripts/hf_mf_keycheck.lua
+++ b/client/luascripts/hf_mf_keycheck.lua
@@ -216,7 +216,7 @@ local function perform_check(uid, numsectors)
     for sector = 0, #keys do
         -- Check if user aborted
         if core.kbd_enter_pressed() then
-            print('Aborted by user')
+            print('Aborted via keyboard!')
             break
         end
 
diff --git a/client/luascripts/lf_electra.lua b/client/luascripts/lf_electra.lua
index 5b0886aa4..7502522e8 100644
--- a/client/luascripts/lf_electra.lua
+++ b/client/luascripts/lf_electra.lua
@@ -299,7 +299,7 @@ local function main(args)
         if answer == 'n' then
             core.console('clear')
             print( string.rep('--',39) )
-            print(ac.red..'                                  USER ABORTED'..ac.reset)
+            print(ac.red..'                                  Aborted via keyboard!'..ac.reset)
             print( string.rep('--',39) )
             break
         end
diff --git a/client/luascripts/lf_em4100_bulk.lua b/client/luascripts/lf_em4100_bulk.lua
index 87d8bc91b..8a2ff399e 100644
--- a/client/luascripts/lf_em4100_bulk.lua
+++ b/client/luascripts/lf_em4100_bulk.lua
@@ -198,7 +198,7 @@ local function main(args)
                 core.console('lf em 410x reader')
             end
         else
-            print(ac.red..'User aborted'..ac.reset)
+            print(ac.red..'aborted via keyboard!'..ac.reset)
             low = i
             break
         end
diff --git a/client/src/cmdparser.c b/client/src/cmdparser.c
index 0264105e3..d170c6828 100644
--- a/client/src/cmdparser.c
+++ b/client/src/cmdparser.c
@@ -27,7 +27,7 @@
 #include "util_posix.h" // msleep
 
 #if defined(__MACH__) && defined(__APPLE__)
-# include "pthread_spin_lock_shim.h"
+# include "pthread_spin_lock_shim.h"  // spinlock shim for OSX ..
 #endif
 
 #define MAX_PM3_INPUT_ARGS_LENGTH    4096
@@ -229,7 +229,6 @@ static int execute_system_command(const char *command) {
     pthread_spin_init(&sycmd_spinlock, 0);
     pthread_spin_lock(&sycmd_spinlock);
 
-
     int ret;
 
     #if defined(_WIN32)