diff --git a/custom_components/mikrotik_router/device_tracker.py b/custom_components/mikrotik_router/device_tracker.py
index c73486d..2d57c4b 100644
--- a/custom_components/mikrotik_router/device_tracker.py
+++ b/custom_components/mikrotik_router/device_tracker.py
@@ -117,7 +117,7 @@ class MikrotikControllerPortDeviceTracker(ScannerEntity):
 
     async def async_added_to_hass(self):
         """Port entity created."""
-        _LOGGER.debug("New port tracker %s (%s)", self._inst, self._data['port-mac-address'])
+        _LOGGER.debug("New port tracker %s (%s %s)", self._inst, self._data['default-name'], self._data['port-mac-address'])
         return
 
     async def async_update(self):
diff --git a/custom_components/mikrotik_router/mikrotikapi.py b/custom_components/mikrotik_router/mikrotikapi.py
index 520b615..fbfb089 100644
--- a/custom_components/mikrotik_router/mikrotikapi.py
+++ b/custom_components/mikrotik_router/mikrotikapi.py
@@ -122,7 +122,7 @@ class MikrotikAPI:
 
         try:
             response = self._connection.path(path)
-            tuple(response)
+            _LOGGER.debug("API response ({}): {}".format(path, tuple(response)))
         except librouteros_custom.exceptions.ConnectionClosed:
             _LOGGER.error("Mikrotik %s connection closed", self._host)
             self._connected = False
@@ -251,6 +251,7 @@ class MikrotikAPI:
         args = {'interface': interfaces, 'once': True}
         try:
             traffic = response('monitor-traffic', **args)
+            _LOGGER.debug("API response ({}): {}".format("/interface/monitor-traffic", tuple(response)))
         except librouteros_custom.exceptions.ConnectionClosed:
             _LOGGER.error("Mikrotik %s connection closed", self._host)
             self._connected = False
diff --git a/custom_components/mikrotik_router/sensor.py b/custom_components/mikrotik_router/sensor.py
index 7679f4a..29833fe 100644
--- a/custom_components/mikrotik_router/sensor.py
+++ b/custom_components/mikrotik_router/sensor.py
@@ -239,7 +239,7 @@ class MikrotikControllerTrafficSensor(MikrotikControllerSensor):
     @property
     def unique_id(self):
         """Return a unique_id for this entity."""
-        return "{}-{}-{}".format(self._inst.lower(), self._sensor.lower(), self._data['name'].lower())
+        return "{}-{}-{}".format(self._inst.lower(), self._sensor.lower(), self._data['default-name'].lower())
 
     @property
     def device_info(self):
@@ -251,3 +251,8 @@ class MikrotikControllerTrafficSensor(MikrotikControllerSensor):
             "name": self._data['default-name'],
         }
         return info
+
+    async def async_added_to_hass(self):
+        """Port entity created."""
+        _LOGGER.debug("New sensor %s (%s %s)", self._inst, self._data['default-name'], self._sensor)
+        return
\ No newline at end of file
diff --git a/custom_components/mikrotik_router/switch.py b/custom_components/mikrotik_router/switch.py
index 7a2a92f..95b6271 100644
--- a/custom_components/mikrotik_router/switch.py
+++ b/custom_components/mikrotik_router/switch.py
@@ -94,7 +94,7 @@ def update_items(inst, mikrotik_controller, async_add_entities, switches):
 
     # Add switches
     for sid, sid_func in zip(
-        ["interface", "nat", "script"], 
+        ["interface", "nat", "script"],
         [MikrotikControllerPortSwitch, MikrotikControllerNATSwitch, MikrotikControllerScriptSwitch]
     ):
         for uid in mikrotik_controller.data[sid]:
@@ -157,7 +157,7 @@ class MikrotikControllerPortSwitch(MikrotikControllerSwitch):
 
     async def async_added_to_hass(self):
         """Port entity created."""
-        _LOGGER.debug("New port switch %s (%s)", self._inst, self._data['port-mac-address'])
+        _LOGGER.debug("New port switch %s (%s %s)", self._inst, self._data['default-name'], self._data['port-mac-address'])
         return
 
     @property