diff --git a/config/devices.properties b/config/devices.properties
index 53137459..7df6ac02 100644
--- a/config/devices.properties
+++ b/config/devices.properties
@@ -1,7 +1,7 @@
 #det=ch.psi.pshell.epics.AreaDetector X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1
 Scienta=ch.psi.pshell.epics.Scienta X03DA-SCIENTA:cam1 X03DA-SCIENTA:image1
 Manip=ch.psi.pshell.epics.Manipulator 
-$Eph=ch.psi.pshell.epics.Positionable X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy
+Eph=ch.psi.pshell.epics.Positionable X03DA-PHS-E:GO.A X03DA-PGM:rbkenergy
 ManipulatorX=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRX
 ManipulatorY=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRY
 ManipulatorZ=ch.psi.pshell.epics.Motor X03DA-ES2-MA:TRZ
@@ -24,7 +24,7 @@ CountsR4=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:Stats4:Total_RBV Read 3
 #lowen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:LOW_ENERGY 6
 #highen=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:HIGH_ENERGY 6
 ExcitationEnergy=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:EXCITATION_ENERGY_RBV Read
-StepSize=ch.psi.pshell.epics.ChannelDouble 03DA-SCIENTA:cam1:STEP_SIZE_RBV Read
+StepSize=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:STEP_SIZE_RBV Read
 NumIterations=ch.psi.pshell.epics.ChannelDouble X03DA-SCIENTA:cam1:NumExposures_RBV Read
 PassEnergy=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:PASS_ENERGY_RBV Read
 LensMode=ch.psi.pshell.epics.ChannelString X03DA-SCIENTA:cam1:LENS_MODE_RBV Read
@@ -47,8 +47,8 @@ MonoVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:ctr Read
 MonoVSize=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SV:size Read
 $MonoBladeDown=ch.psi.pshell.epics.ChannelDouble X03DA-AU:DW Read
 $MonoBladeUp=ch.psi.pshell.epics.ChannelDouble X03DA-AU:UP Read
-$MonoHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:ctr Read
-$MonoHSize=ch.psi.pshell.epics.ChannelDouble 03DA-AU-SH:size Read
+MonoHCenter=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:ctr Read
+MonoHSize=ch.psi.pshell.epics.ChannelDouble X03DA-AU-SH:size Read
 MonoApertureMode=ch.psi.pshell.epics.ChannelDouble X03DA-PHS:AU Read
 RefocusVCenter=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:ctr Read
 RefocusVSize=ch.psi.pshell.epics.ChannelDouble X03DA-RMU-SV:size Read
diff --git a/devices/Eph.properties b/devices/Eph.properties
new file mode 100644
index 00000000..760fee4c
--- /dev/null
+++ b/devices/Eph.properties
@@ -0,0 +1,9 @@
+#Mon Nov 02 14:14:09 CET 2015
+accessType=ReadWrite
+maxValue=160.0
+minValue=160.0
+offset=0.0
+precision=160
+resolution=NaN
+scale=1.0
+unit=160.000
diff --git a/devices/manip.properties b/devices/Manip.properties
similarity index 100%
rename from devices/manip.properties
rename to devices/Manip.properties
diff --git a/devices/phi.properties b/devices/ManipulatorPhi.properties
similarity index 100%
rename from devices/phi.properties
rename to devices/ManipulatorPhi.properties
diff --git a/devices/theta.properties b/devices/ManipulatorTheta.properties
similarity index 100%
rename from devices/theta.properties
rename to devices/ManipulatorTheta.properties
diff --git a/devices/tilt.properties b/devices/ManipulatorTilt.properties
similarity index 100%
rename from devices/tilt.properties
rename to devices/ManipulatorTilt.properties
diff --git a/devices/x.properties b/devices/ManipulatorX.properties
similarity index 100%
rename from devices/x.properties
rename to devices/ManipulatorX.properties
diff --git a/devices/y.properties b/devices/ManipulatorY.properties
similarity index 100%
rename from devices/y.properties
rename to devices/ManipulatorY.properties
diff --git a/devices/z.properties b/devices/ManipulatorZ.properties
similarity index 100%
rename from devices/z.properties
rename to devices/ManipulatorZ.properties
diff --git a/devices/eph.properties b/devices/eph.properties
deleted file mode 100644
index cf75145d..00000000
--- a/devices/eph.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-#Tue Jul 21 15:15:41 CEST 2015
-accessType=ReadWrite
-maxValue=NaN
-minValue=NaN
-offset=0.0
-precision=-1
-resolution=NaN
-scale=1.0
-unit=null
diff --git a/script/local.py b/script/local.py
index 7e1dd7e9..443f5a93 100644
--- a/script/local.py
+++ b/script/local.py
@@ -76,13 +76,13 @@ diag_channels.append(AcquisitionMode)            #diag_attrs.append(ChannelStrin
 diag_channels.append(EnergyMode)                 #diag_attrs.append(ChannelString("EnergyMode", "X03DA-SCIENTA:cam1:ENERGY_MODE_RBV"))
 diag_channels.append(DetectorMode)               #diag_attrs.append(ChannelString("DetectorMode", "X03DA-SCIENTA:cam1:DETECTOR_MODE_RBV"))
 diag_channels.append(ElementSet)                 #diag_attrs.append(ChannelString("ElementSet", "X03DA-SCIENTA:cam1:ELEMENT_SET_RBV"))
-diag_channels.append(ExcitationEnergyElemeAnalyserSlitntSet         #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
+diag_channels.append(ElemeAnalyserSlitntSet)     #diag_attrs.append(ChannelString("ElemeAnalyserSlitntSet", "X03DA-SCIENTA:cam1:ANALYSER_SLIT_RBV"))
 
 #Manipulator Settings
 diag_channels.append(ManipulatorX) 
 diag_channels.append(ManipulatorY) 
 diag_channels.append(ManipulatorZ) 
-diag_channels.append(ManipulatorTheta 
+diag_channels.append(ManipulatorTheta)
 diag_channels.append(ManipulatorTilt) 
 diag_channels.append(ManipulatorPhi) 
 
@@ -152,7 +152,7 @@ diag_channels.append(ManipulatorCoolFlowSet)
     
 def print_diag():
     for f in diag_channels:
-        print f.getName() + " = " + str(f.read())
+        print "{:<5} = {:<30}\n".format(f.getName() ,  str(f.read()))
 
 
     
\ No newline at end of file