diff --git a/fsmEvse.py b/fsmEvse.py
index 5e0fd21..7ee8e42 100644
--- a/fsmEvse.py
+++ b/fsmEvse.py
@@ -21,7 +21,7 @@ stateWaitForPowerDeliveryRequest = 8
 
 class fsmEvse():
     def addToTrace(self, s):
-        self.callbackAddToTrace(s)
+        self.callbackAddToTrace("[EVSE] " + s)
         
     def enterState(self, n):
         self.addToTrace("from " + str(self.state) + " entering " + str(n))
@@ -184,7 +184,7 @@ class fsmEvse():
     def __init__(self, callbackAddToTrace):
         self.callbackAddToTrace = callbackAddToTrace
         self.addToTrace("initializing fsmEvse") 
-        self.Tcp = pyPlcTcpSocket.pyPlcTcpServerSocket()
+        self.Tcp = pyPlcTcpSocket.pyPlcTcpServerSocket(self.callbackAddToTrace)
         self.state = 0
         self.cyclesInState = 0
         self.rxData = []
diff --git a/fsmPev.py b/fsmPev.py
index 7340c5f..a66674f 100644
--- a/fsmPev.py
+++ b/fsmPev.py
@@ -27,7 +27,7 @@ dinEVSEProcessingType_Ongoing = "1"
 
 class fsmPev():
     def addToTrace(self, s):
-        self.callbackAddToTrace(s)
+        self.callbackAddToTrace("[PEV] " + s)
         
     def enterState(self, n):
         print("from " + str(self.state) + " entering " + str(n))
diff --git a/pyPlcTcpSocket.py b/pyPlcTcpSocket.py
index 6923464..17e0e57 100644
--- a/pyPlcTcpSocket.py
+++ b/pyPlcTcpSocket.py
@@ -192,7 +192,7 @@ class pyPlcTcpServerSocket():
                 client_socket, address = self.ourSocket.accept()
                 # and we append this new socket to the list of sockets, which in the next loop will be handled by the select.
                 self.read_list.append(client_socket)
-                self.addToTrace("Connection from", address)
+                self.addToTrace("Connection from " + str(address))
             else:
                 # It is not the "listener socket", it is an above created "client socket" for talking with a client.
                 # Let's take the data from it: