diff --git a/main.py b/main.py
index ef23a2f..8292e80 100644
--- a/main.py
+++ b/main.py
@@ -7,14 +7,14 @@ import json
 from influxdb import InfluxDBClient
 from time import time, sleep
 
-serverip = os.environ['INFLUX_IP']
-serverport = os.environ['INFLUX_PORT', 8086]
-serverdatabase = os.environ['INFLUX_DB', 'telegraf']
-servernickname = os.environ['NICKNAME', 'SERV01'] # Name to put under in influx
-server = os.environ['SPEEDTEST_SERVER','19249']
+serverip = os.getenv('INFLUX_IP')
+serverport = os.getenv('INFLUX_PORT', '8086')
+serverdatabase = os.getenv('INFLUX_DB', 'telegraf')
+servernickname = os.getenv('NICKNAME', 'SERV01') # Name to put under in influx
+stserver = os.getenv('SPEEDTEST_SERVER','19249')
 
 def speed():    # Actual Speedtest using speedtest-cli 
-    servers = [servertag] # If you want to test against a specific server eg. ['13030'] or [] for closest server
+    servers = [stserver] # If you want to test against a specific server eg. ['13030'] or [] for closest server
     threads = 16
     # Choose the amount of threads to use for the test
     test = speedtest.Speedtest()
@@ -58,8 +58,15 @@ def uploadInfluxdata(host, port): # Main upload section
     client = InfluxDBClient(host, port, database = serverdatabase)  # Init connection to Influx Server
     client.write_points(json_body)  # Write Speedtest results
 
+# Check ENV variables
+# print(serverip)
+# print(serverport)
+# print(serverdatabase)
+# print(servernickname)
+# print(stserver)
+
 while True:
-    print("Running Test")
+    print("Running Test") # Show in console 
     uploadInfluxdata(serverip, serverport)
     sleep(600)