diff --git a/power_mqtt1.py b/power_mqtt1.py
index ef81f65..1595c14 100755
--- a/power_mqtt1.py
+++ b/power_mqtt1.py
@@ -63,6 +63,7 @@ def i2c_status_thread_new():
                     mqtc.publish("foobar/aerie/" + names[i][0] + "/" +  services[names[i][1]] + "/status", states[ns], qos=0, retain=False)
                 state[i] = ns
             time.sleep(5)
+            print( "Sensors Checked")
         time.sleep(1)
 
 #Buttonbefehle
@@ -132,19 +133,25 @@ light = {"flur": 0, "baellebad": 1, "lounge-front": 2,
 #             baellebad
 #             zentral 
 
+def zentral_aus():
+    for i in state:
+        state[i] = 0
+    for k,v in names.items():
+        mqtc.publish("foobar/aerie/" + v[0] + "/" + services[v[1]] + "/status", "off" )
+
 def switch_state(i, state_, speed=0.5):
     if state[i] != state_: # changed
         switch(i,speed=0.5)
         state[i] = state_
-        return True
-    return False
+    return state[i]
 
 def switch_toggle(i,speed=0.5):
     switch(i, speed=speed)
     # power can only be switched on, and centrally shutdown
-    if i in [ 4,5,6]:
-       state[i] = 1
-    elif i == 7:
+    #if i in [ 4,5,6]:
+    #   state[i] = 1
+    # not anymore
+    if i == 7:
        state[i] = 0
     elif i < 16: 
         state[i] = 0 if state[i] == 1 else 1
@@ -153,14 +160,16 @@ def switch_toggle(i,speed=0.5):
 def decode_topic(topic, state):
     clist = topic.split('/')
     if clist[3] == "strom" and clist[2] == "zentral":
-        if switch_state(power[clist[2]], 0):
-            mqtc.publish(topic.replace("action", "status"), states[state], qos=0, retain=False)
-            return 0
+        zentral_aus()
+
+    if clist[3] == "licht" and clist[2] in light:
+        ns = switch_state(light[clist[2]], state)
+        mqtc.publish(topic.replace("action", "status"), states[ns], qos=0, retain=False)
+    
+    if clist[3] == "strom" and clist[2] in power:
+        ns = switch_state(power[clist[2]], state)
+        mqtc.publish(topic.replace("action", "status"), states[ns], qos=0, retain=False)
 
-    if clist[3] == "licht" or clist[3] == "strom":
-        if clist[2] in light or clist[2] in power:
-            if switch_state(commands[clist[2]], state):
-                mqtc.publish(topic.replace("action", "status"), states[state], qos=0, retain=False)
 
 def msgs(inp, topic):
     c = inp.decode("utf-8")
@@ -205,13 +214,17 @@ def msgs(inp, topic):
                     time.sleep(0.01)
             #command with parameter used for dimming
             else:
-                switch(command, speed=4 * arg / 100 + 1)
-                if state[command] == 0:
-                    state[command] == 1
+                if arg < 100 :
+                    switch(command, speed=4 * arg / 100 + 1)
+                    if state[command] == 0:
+                        state[command] = 1
+                        mqtc.publish("foobar/aerie/" + names[command][0] + "/" + services[names[command][1]] + "/status", states[state[command]]) 
 
         #single string command without parameter
         else:
             print ("One Command")
+            if commands[c] == 7:
+                zentral_aus()
             if c in commands:  
                 switch_toggle(commands[c])
     return