diff --git a/bin/mm-bolus.py b/bin/mm-bolus.py
index 6be7a77..2364e51 100755
--- a/bin/mm-bolus.py
+++ b/bin/mm-bolus.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 from decocare import commands
 from decocare import lib
 from decocare.helpers import cli
diff --git a/bin/mm-decode-history-page.py b/bin/mm-decode-history-page.py
index 2affec0..9fd02a0 100755
--- a/bin/mm-decode-history-page.py
+++ b/bin/mm-decode-history-page.py
@@ -1,5 +1,6 @@
-
+#!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 import sys
 import argparse, argcomplete
 import textwrap
diff --git a/bin/mm-latest.py b/bin/mm-latest.py
index 9c051bc..f1452e2 100755
--- a/bin/mm-latest.py
+++ b/bin/mm-latest.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 from decocare import commands
 import io
 import json
diff --git a/bin/mm-pages.py b/bin/mm-pages.py
index 41308db..94aeeec 100755
--- a/bin/mm-pages.py
+++ b/bin/mm-pages.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 from decocare import commands
 import io
 import json
diff --git a/bin/mm-press-key.py b/bin/mm-press-key.py
index 0a2d0b7..0203ee1 100755
--- a/bin/mm-press-key.py
+++ b/bin/mm-press-key.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
-from decocare import commands
 
+from decocare import commands
 from decocare.helpers import cli
 
 class PressKeysApp (cli.CommandApp):
diff --git a/bin/mm-set-rtc.py b/bin/mm-set-rtc.py
index ad89f40..d08fc70 100755
--- a/bin/mm-set-rtc.py
+++ b/bin/mm-set-rtc.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 from decocare import commands
 from decocare.helpers import cli
 import argparse
diff --git a/bin/mm-temp-basals.py b/bin/mm-temp-basals.py
index 0f21e44..a5164cf 100755
--- a/bin/mm-temp-basals.py
+++ b/bin/mm-temp-basals.py
@@ -1,5 +1,6 @@
 #!/usr/bin/env python
 # PYTHON_ARGCOMPLETE_OK
+
 from decocare import commands
 from decocare.helpers import cli
 import argparse
diff --git a/bin/scapy_dump.py b/bin/scapy_dump.py
index 8874687..eec99f9 100755
--- a/bin/scapy_dump.py
+++ b/bin/scapy_dump.py
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 """
 decoder.py - An analysis of Medtronic Carelink Diabetes protocol using
 scapy.
diff --git a/bin/scapy_layer.py b/bin/scapy_layer.py
index 1f9b752..e2ce280 100644
--- a/bin/scapy_layer.py
+++ b/bin/scapy_layer.py
@@ -1,4 +1,6 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 import argparse
 
 from pprint import pprint, pformat
diff --git a/ez_setup.py b/ez_setup.py
index 837ef3f..f2ba870 100644
--- a/ez_setup.py
+++ b/ez_setup.py
@@ -1,4 +1,6 @@
-#!python
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 """Bootstrap setuptools installation
 
 If you want to use setuptools in your package's setup.py, just include this
diff --git a/find_data_position.py b/find_data_position.py
index f540d32..ae3ff91 100644
--- a/find_data_position.py
+++ b/find_data_position.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 ##############################################################################
 # Edward Robinson
 #
diff --git a/find_dates.py b/find_dates.py
index 4b0f5e1..f0789d2 100644
--- a/find_dates.py
+++ b/find_dates.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 import sys
 import argparse
diff --git a/find_print_op_codes.py b/find_print_op_codes.py
index 142a05b..16e3b1c 100644
--- a/find_print_op_codes.py
+++ b/find_print_op_codes.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 ##############################################################################
 # Edward Robinson
diff --git a/list_cgm.py b/list_cgm.py
index c2acfd9..9a1d1d1 100644
--- a/list_cgm.py
+++ b/list_cgm.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 import sys
 import argparse
 
diff --git a/list_dates.py b/list_dates.py
index dd3e845..f06becd 100644
--- a/list_dates.py
+++ b/list_dates.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 import sys
 import argparse
diff --git a/list_history.py b/list_history.py
index d3a2fde..1622727 100644
--- a/list_history.py
+++ b/list_history.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 import sys
 import argparse
diff --git a/list_opcodes.py b/list_opcodes.py
index 02b9cb7..384911f 100644
--- a/list_opcodes.py
+++ b/list_opcodes.py
@@ -1,3 +1,5 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 import sys
 import argparse
diff --git a/parser_tester.py b/parser_tester.py
index 39c864b..1501c45 100644
--- a/parser_tester.py
+++ b/parser_tester.py
@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
+
 ################################################################################
 #
 # Edward Robinson
diff --git a/setup.py b/setup.py
index 3c86a39..e96bab4 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,5 @@
-#!/usr/bin/python
+#!/usr/bin/env python
+# PYTHON_ARGCOMPLETE_OK
 
 from setuptools import setup, find_packages
 import platform