diff --git a/FabLock/src/config_example.h b/FabLock/src/config_example.h
index 3d215c1..1ab4f44 100644
--- a/FabLock/src/config_example.h
+++ b/FabLock/src/config_example.h
@@ -2,6 +2,6 @@
 #define WLAN_PASS ""
 #define MQTT_BROKER ""
 #define FABLOCKID 1
-#define MPC_RELAIS_ADDR 0x02
+#define MPC_RELAIS_ADDR 0x20
 #define HAS_FEEDBACK 1
-#define MPC_FEEDBACK_ADDR 0x03
\ No newline at end of file
+#define MPC_FEEDBACK_ADDR 0x21
\ No newline at end of file
diff --git a/FabLock/src/main.cpp b/FabLock/src/main.cpp
index 7cad8e1..4108abf 100644
--- a/FabLock/src/main.cpp
+++ b/FabLock/src/main.cpp
@@ -19,13 +19,10 @@ char msg[MSG_BUFFER_SIZE];
 char topic_recv[TOPIC_BUFFER_SIZE];
 char topic_send[TOPIC_BUFFER_SIZE];
 
-void setup_wifi() 
+void setup_wifi()
 {
     delay(10);
-
-    Serial.println();
-    Serial.print("Connecting to ");
-    Serial.println(WLAN_SSID);
+    Serial.println("Connecting Wifi ...");
 
     WiFi.mode(WIFI_STA);
     WiFi.begin(WLAN_SSID, WLAN_PASS);
@@ -33,15 +30,9 @@ void setup_wifi()
     while (WiFi.status() != WL_CONNECTED) 
     {
         delay(500);
-        Serial.print(".");
     }
 
     randomSeed(micros());
-
-    Serial.println("");
-    Serial.println("WiFi connected");
-    Serial.println("IP address: ");
-    Serial.println(WiFi.localIP());
 }
 
 void callback(char* topic, byte* payload, unsigned int length)
@@ -51,7 +42,7 @@ void callback(char* topic, byte* payload, unsigned int length)
     int topic_len = (int)strlen(topic);
     int trigger_len = (int)strlen("/trigger");
     int set_state_len = (int)strlen("/set_state");
-    if(strcmp(topic + topic_len - trigger_len, "/trigger"))
+    if(!strcmp(topic + topic_len - trigger_len, "/trigger"))
     {
         char str_id[4] = {0};
         strncpy(str_id, topic  + topic_len - trigger_len - 3, 3);
@@ -71,7 +62,7 @@ void callback(char* topic, byte* payload, unsigned int length)
         }
     }
 
-    if(strcmp(topic + topic_len - set_state_len, "/set_state"))
+    if(!strcmp(topic + topic_len - set_state_len, "/set_state"))
     {
         char str_id[4] = {0};
         strncpy(str_id, topic  + topic_len - trigger_len - 3, 3);
@@ -88,11 +79,11 @@ void callback(char* topic, byte* payload, unsigned int length)
     }
 }
 
-void reconnect() 
+void reconnect()
 {
     while (!client.connected()) 
     {
-        Serial.print("Attempting MQTT connection...");
+        Serial.println("Connecting MQTT ...");
         String clientId = "FABLOCK-";
         clientId += String(random(0xffff), HEX);
         if (client.connect(clientId.c_str())) 
@@ -112,12 +103,13 @@ void reconnect()
     }
 }
 
-void setup() 
+void setup()
 {
     int i = 0;
 
-    pinMode(BUILTIN_LED, OUTPUT);
     Serial.begin(115200);
+    Serial.println();
+
     setup_wifi();
 
     client.setServer(MQTT_BROKER, 1883);
@@ -125,22 +117,22 @@ void setup()
 
     if (!mcp_relais.begin_I2C(MPC_RELAIS_ADDR)) 
     {
-        Serial.println("Error.");
+        Serial.println("MCP Error");
         while (1);
     }
-    for(i = 0; i++; i<MCP_INPUTS)
+    for(i = 0; i<MCP_INPUTS; i++)
     {
-        mcp_feedback.pinMode(i, OUTPUT);
+        mcp_relais.pinMode(i, OUTPUT);
     }
 
     if(HAS_FEEDBACK)
     {
         if (!mcp_feedback.begin_I2C(MPC_FEEDBACK_ADDR)) 
         {
-            Serial.println("Error.");
+            Serial.println("MCP Error");
             while (1);
         }
-        for(i = 0; i++; i<MCP_INPUTS)
+        for(i = 0; i<MCP_INPUTS; i++)
         {
             mcp_feedback.pinMode(i, INPUT_PULLUP);
         }
@@ -161,21 +153,21 @@ void loop()
         lastMsg = now;
         int value;
 
-        Serial.print("Publish State and Feedback");
-        for(int i = 0; i++; i<MCP_INPUTS)
+        Serial.println("Publish State and Feedback");
+        for(int i=0; i<MCP_INPUTS; i++)
         {
             value = mcp_relais.digitalRead(i);
-            snprintf (msg, MSG_BUFFER_SIZE, "%ld", value);
+            snprintf (msg, MSG_BUFFER_SIZE, "%d", value);
             snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/state", FABLOCKID, i);
             client.publish(topic_send, msg);
         }
 
         if(HAS_FEEDBACK)
         {
-            for(int i = 0; i++; i<MCP_INPUTS)
+            for(int i=0; i<MCP_INPUTS; i++)
             {
-                value = mcp_feedback.digitalRead(i);
-                snprintf (msg, MSG_BUFFER_SIZE, "%ld", value);
+                value = !mcp_feedback.digitalRead(i);
+                snprintf (msg, MSG_BUFFER_SIZE, "%d", value);
                 snprintf (topic_send, TOPIC_BUFFER_SIZE, "fablock/%03d/%03d/feedback", FABLOCKID, i);
                 client.publish(topic_send, msg);
             }