diff --git a/flash-all.sh b/flash-all.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-all.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/flash-bootrom.sh b/flash-bootrom.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-bootrom.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/flash-fullimage.sh b/flash-fullimage.sh
new file mode 100755
index 000000000..27e1fb526
--- /dev/null
+++ b/flash-fullimage.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd $(dirname "$0")
+. proxmark3.sh
diff --git a/proxmark3.sh b/proxmark3.sh
index 4a7a004d5..0d7b36657 100755
--- a/proxmark3.sh
+++ b/proxmark3.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
 
+FULLIMAGE="armsrc/obj/fullimage.elf"
+BOOTIMAGE="bootrom/obj/bootrom.elf"
+
+cd $(dirname "$0")
+
 function wait4proxmark_Linux {
     echo >&2 "Waiting for Proxmark to appear..."
     while [ ! -c /dev/ttyACM? -a ! -c /dev/pm3-? ]; do
@@ -23,10 +28,38 @@ function wait4proxmark_macOS {
     echo $PM3
 }
 
-# start proxmark with first detected interface
+SCRIPT=$(basename -- "$0")
 
-if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/proxmark3 $(wait4proxmark_Linux) "$@"
-elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/proxmark3 $(wait4proxmark_macOS) "$@"
+if [ "$SCRIPT" = "proxmark3.sh" ]; then
+  CMD=client/proxmark3
+elif [ "$SCRIPT" = "flash-all.sh" ]; then
+  CMD=client/flasher
+  ARG1="-b $BOOTIMAGE"
+  ARG2="$FULLIMAGE"
+elif [ "$SCRIPT" = "flash-fullimage.sh" ]; then
+  CMD=client/flasher
+  ARG2="$FULLIMAGE"
+elif [ "$SCRIPT" = "flash-bootrom.sh" ]; then
+  CMD=client/flasher
+  ARG1="-b $BOOTIMAGE"
+else
+  echo "Script ran under unknown name, abort: $SCRIPT"
+  exit 1
 fi
+HOSTOS=$(uname | awk '{print toupper($0)}')
+if [ "$HOSTOS" = "LINUX" ]; then
+    PORT=$(wait4proxmark_Linux)
+elif [ "$HOSTOS" = "DARWIN" ]; then
+    PORT=$(wait4proxmark_macOS)
+else
+    echo "Host OS not recognized, abort: $HOSTOS"
+    exit 1
+fi
+if [ "$PORT" = "" ]; then
+    echo "No port, abort"
+    exit 1
+fi
+
+echo Running "$CMD" "$PORT" $ARG1 $ARG2 "$@"
+"$CMD" "$PORT" $ARG1 $ARG2 "$@"
+exit $?
diff --git a/tools/mkversion.pl b/tools/mkversion.pl
index a71aac96f..715b8081c 100644
--- a/tools/mkversion.pl
+++ b/tools/mkversion.pl
@@ -14,7 +14,7 @@ $ENV{'LC_ALL'} = "C";
 $ENV{'LANG'} = "C";
 
 # if you are making your own fork,  change this line to reflect your fork-name
-my $fullgitinfo = 'iceman';
+my $fullgitinfo = 'RRG';
 my $ctime;
 # GIT status  0 = dirty,  1 = clean ,  2 = undecided
 my $clean = 2;
diff --git a/update.sh b/update.sh
deleted file mode 100755
index aa58b693e..000000000
--- a/update.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-FULLIMAGE="armsrc/obj/fullimage.elf"
-if [ "$1" == "-b" ]; then
-  FLASHBOOT="-b bootrom/obj/bootrom.elf"
-fi
-
-function wait4proxmark_Linux {
-    echo >&2 "Waiting for Proxmark to appear..."
-    while [ ! -c /dev/ttyACM? -a ! -L /dev/pm3-? ]; do
-        sleep .1
-    done
-    local PM3=`ls -1 /dev/pm3-? /dev/ttyACM? 2>/dev/null | head -1`
-    echo >&2 -e "Found proxmark on ${PM3}\n"
-    echo $PM3
-}
-
-function wait4proxmark_macOS {
-    echo >&2 "Waiting for Proxmark to appear..."
-    while true; do
-        PM3=$(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)
-        if [[ $PM3 != "" ]]; then
-            #echo >&2 -e "Found proxmark on $(ls /dev/pm3-* /dev/cu.usbmodem* 2>/dev/null | head -1)\n"
-            break
-        fi
-        sleep .1
-    done
-    echo $PM3
-}
-
-# Detect OS and flash bootroom & system image
-
-if [[ $(uname | awk '{print toupper($0)}') == "LINUX" ]]; then
-    client/flasher $(wait4proxmark_Linux) $FLASHBOOT $FULLIMAGE
-elif [[ $(uname | awk '{print toupper($0)}') == "DARWIN" ]]; then
-    client/flasher $(wait4proxmark_macOS) $FLASHBOOT $FULLIMAGE
-fi