diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp
index 9d60967ef..a6044f184 100644
--- a/slsDetectorSoftware/slsDetector/slsDetector.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp
@@ -2650,7 +2650,6 @@ slsDetectorDefs::sls_detector_module  *slsDetector::getModule(int imod){
     deleteModule(myMod);
     myMod=NULL;
   }
-
   return myMod;
 }
 
@@ -2875,22 +2874,9 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 			//create file names
 			switch(thisDetector->myDetectorType){
 			case EIGER:
-				ostfn << thisDetector->settingsDir << ssettings <<"/settings.sn";//  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
-				oscfn << thisDetector->calDir << ssettings << "/calibration.sn";//  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
-
-				//add the trimbits binary file - temp solution
-
-				nch=((myMod->nchan)/(myMod->nchip));
-				for (ichip=0; ichip<myMod->nchip; ichip++) {
-					myMod->chipregs[ichip]=0;
-					for (ichan=0; ichan<nch; ichan++){
-						myMod->chanregs[ichip*nch+ichan]=0;
-					}
-				}
-				break;
 			case MOENCH:
 			case GOTTHARD:
-				//settings is saved in myMod.reg for gotthard
+				//settings is saved in myMod.reg
 				myMod->reg=thisDetector->currentSettings;
 				ostfn << thisDetector->settingsDir << ssettings <<"/settings.sn";//  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
 				oscfn << thisDetector->calDir << ssettings << "/calibration.sn";//  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im) << setbase(10);
@@ -2917,6 +2903,7 @@ slsDetectorDefs::detectorSettings slsDetector::setSettings( detectorSettings ise
 			} else {
 				ostringstream ostfn,oscfn;
 				switch(thisDetector->myDetectorType){
+				case EIGER:
 				case MOENCH:
 				case GOTTHARD:
 					ostfn << thisDetector->settingsDir << ssettings << ssettings << ".settings";
@@ -5541,7 +5528,7 @@ int slsDetector::saveSettingsFile(string fname, int imod) {
   }
   for (int im=mmin; im<mmax; im++) {
     ostringstream ostfn;
-    ostfn << fname << ".sn"  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im); 
+    ostfn << fname << ".sn"  << setfill('0') << setw(3) << hex << getId(MODULE_SERIAL_NUMBER, im);
     if ((myMod=getModule(im))) {
       ret=writeSettingsFile(ostfn.str(), thisDetector->myDetectorType, *myMod);
       deleteModule(myMod);
diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
index 4c86b4900..24b71ce3b 100644
--- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
+++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
@@ -155,7 +155,7 @@ int slsDetectorUsers::setBeamEnergy(int e_eV){
 double slsDetectorUsers::setExposureTime(double t, bool inseconds){
   int64_t tms = t * (1E+9);
   if (t < 0) tms = -1;
-  if(inseconds)
+  if(!inseconds)
     return myDetector->setExposureTime(t);
   else
     return  ((1E-9) * (double)myDetector->setExposureTime(tms));
@@ -164,8 +164,8 @@ double slsDetectorUsers::setExposureTime(double t, bool inseconds){
 double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
   int64_t tms = t * (1E+9);
   if (t < 0) tms = -1;
-  if(inseconds)
-    return myDetector->setExposureTime(t);
+  if(!inseconds)
+    return myDetector->setExposurePeriod(t);
   else
     return  ((1E-9) * (double)myDetector->setExposurePeriod(tms));
 }
@@ -173,8 +173,8 @@ double slsDetectorUsers::setExposurePeriod(double t, bool inseconds){
 double slsDetectorUsers::setDelayAfterTrigger(double t, bool inseconds){
   int64_t tms = t * (1E+9);
   if (t < 0) tms = -1;
-  if(inseconds)
-    return myDetector->setExposureTime(t);
+  if(!inseconds)
+    return myDetector->setDelayAfterTrigger(t);
   else
     return  ((1E-9) * (double)myDetector->setDelayAfterTrigger(tms));
 }
diff --git a/slsDetectorSoftware/slsDetector/svnInfoLib.h b/slsDetectorSoftware/slsDetector/svnInfoLib.h
index 93739dea8..2d745bc41 100644
--- a/slsDetectorSoftware/slsDetector/svnInfoLib.h
+++ b/slsDetectorSoftware/slsDetector/svnInfoLib.h
@@ -2,10 +2,10 @@
 #define SVNURLLIB "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorSoftware"
 //#define SVNREPPATH ""
 #define SVNREPUUIDLIB "951219d9-93cf-4727-9268-0efd64621fa3"
-//#define SVNREV 0x616
+//#define SVNREV 0x621
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTHLIB "l_maliakal_d"
-#define SVNREVLIB 0x616
-#define SVNDATELIB 0x20130619
+#define SVNREVLIB 0x621
+#define SVNDATELIB 0x20130620
 //