diff --git a/ercf/software.cfg b/ercf/software.cfg
index 2776c89..ed7259c 100644
--- a/ercf/software.cfg
+++ b/ercf/software.cfg
@@ -362,7 +362,7 @@ gcode:
     SET_FILAMENT_SENSOR SENSOR=encoder_sensor ENABLE=0
     {% if printer["gcode_macro ERCF_HOME"].home == -1 %}
         M118 ERCF not homed, homing it...
-        ERCF_HOME
+        ERCF_HOME TOOL={params.TOOL|int}
         M117 Change Tool T{params.TOOL|int}
         ERCF_LOAD_TOOL TOOL={params.TOOL|int}
     {% elif printer["gcode_macro ERCF_SELECT_TOOL"].color_selected|int != params.TOOL|int %}
@@ -754,7 +754,7 @@ gcode:
     QUERY_ENDSTOPS
     ERCF_EJECT_UNKNOW_STATE
     ERCF_HOME_SELECTOR
-    ERCF_HOME_ONLY
+    ERCF_HOME_ONLY TOOL={params.TOOL|default(0)|int}
 
 [gcode_macro ERCF_HOME_SELECTOR]
 description: Home the ERCF selector
@@ -782,7 +782,7 @@ gcode:
 gcode:
     {% if printer["gcode_macro ERCF_PAUSE"].is_paused|int == 0 %}
         M118 Test load filament 1
-        ERCF_SELECT_TOOL TOOL=0
+        ERCF_SELECT_TOOL TOOL={params.TOOL|default(0)|int}
         ERCF_SET_STEPS RATIO=1.0
         M118 Loading filament to ERCF...
         ERCF_LOAD LENGTH=45
diff --git a/ercf/vars.cfg b/ercf/vars.cfg
index eb170ad..1d0c04b 100644
--- a/ercf/vars.cfg
+++ b/ercf/vars.cfg
@@ -11,5 +11,5 @@ ercf_calib_6 = 1.0
 ercf_calib_7 = 1.0
 ercf_calib_8 = 1.0
 ercf_calib_9 = 1.0
-ercf_calib_ref = 970.985396
+ercf_calib_ref = 979.757328