diff --git a/script/local.py b/script/local.py
index 9eddaaa..7aab31f 100644
--- a/script/local.py
+++ b/script/local.py
@@ -198,13 +198,13 @@ def close_valve(delay = 0.0):    #TODO: Check default delay
 
 def set_energy (value, delay=0.5):
     energy.write(float(value))
-    energy_done.waitValue(1, 5000)
+    energy_done.waitValue(1, -1)
     time.sleep(float(delay))
 
 def set_cff (value):
     cff.write(float(value))
     caput("X07MA-PGM:setE.PROC",1)
-    energy_done.waitValue(1, 1000)
+    energy_done.waitValue(1, -1)
 
 def set_slit(value):
     exit_slit.write(float(value))
@@ -214,7 +214,7 @@ def set_har(value):
     harmonic.write(float(value))
 
 #Not connected
-def set_volt(keithley, value, delay=0.1):
+def set_volt(keithley, value, delaX07MA-PGM:cffy=0.1):
     #keithley.write(float(value))
     if not keithltey in keithleys.keys(): raise Exception("Invalid keithley: " + keithley)
     caput(keithleys[keithley][0], float(value))
@@ -222,7 +222,7 @@ def set_volt(keithley, value, delay=0.1):
 #test k1,k2,k3
 def set_range(keithley, value):
     if not keithley in keithleys.keys(): raise Exception("Invalid keithley: " + keithley)
-    caput(keithleys[keithley][1], int(value))
+    caput(keithleys[keithley][1], str(value))
 
 #only test .5 to .25
 def set_fe(opening):