diff --git a/Grbl_Esp32/data/config.yaml b/Grbl_Esp32/data/config.yaml
index 9dda3f2d..16cc06ed 100644
--- a/Grbl_Esp32/data/config.yaml
+++ b/Grbl_Esp32/data/config.yaml
@@ -7,15 +7,22 @@ step_type: rmt
 dir_delay_microseconds: 1
 pulse_microseconds: 2
 disable_delay_us: 0
+homing_init_lock: false
 
 axes:
   number_axis: 3
   shared_stepper_disable: gpio.13:low
   
   x:
-    limit: gpio.32:high
+    steps_per_mm: 800
+    max_rate: 2000
+    acceleration: 25
+    max_travel: 1000
+    home_mpos: 10
     
     gang0:
+      endstops:
+        dual: gpio.17:low:pu
       stepstick:
         direction: gpio:14
         step: gpio.12
@@ -23,20 +30,38 @@ axes:
       null_motor:
 
   y:
-    limit: gpio.4:low
+    steps_per_mm: 800
+    max_rate: 2000
+    acceleration: 25
+    max_travel: 1000
+    home_mpos: 10
 
     gang0:
+      endstops:
+        dual: gpio.4:low:pu
       stepstick:
         direction: gpio:15
         step: gpio.26
     gang1:
+      null_motor:
+
+  z:
+    steps_per_mm: 800
+    max_rate: 2000
+    acceleration: 25
+    max_travel: 1000
+    home_mpos: 10
+
+    gang0:
+      endstops:
+        dual: gpio.16:low:pu
       stepstick:
         direction: gpio:33
         step: gpio.27
+    gang1:
+      null_motor:
 
 
-laser_mode: true
-
 coolant:
   flood: gpio.25:low
   mist:  gpio.21
diff --git a/Grbl_Esp32/src/Limits.cpp b/Grbl_Esp32/src/Limits.cpp
index 9dd4d164..4957a09c 100644
--- a/Grbl_Esp32/src/Limits.cpp
+++ b/Grbl_Esp32/src/Limits.cpp
@@ -363,14 +363,13 @@ AxisMask limits_get_state() {
             auto gangConfig = config->_axes->_axis[axis]->_gangs[gang_index];
             if (gangConfig->_endstops != nullptr && gangConfig->_endstops->_dual.defined()) {
                 Pin& pin = gangConfig->_endstops->_dual;
-                bitnum_true(pinMask, (pin.read() << axis));
+                if (pin.read()) {
+                    bitnum_true(pinMask, axis);
+                }
             }
         }
     }
 
-#ifdef INVERT_LIMIT_PIN_MASK  // not normally used..unless you have both normal and inverted switches
-    pinMask ^= INVERT_LIMIT_PIN_MASK;
-#endif
     return pinMask;
 }