diff --git a/slsDetectorGui/include/svnInfoGui.h b/slsDetectorGui/include/svnInfoGui.h
index af9d1e6c7..4703b2bca 100644
--- a/slsDetectorGui/include/svnInfoGui.h
+++ b/slsDetectorGui/include/svnInfoGui.h
@@ -2,10 +2,10 @@
 #define SVNURL "file:///afs/psi.ch/project/sls_det_software/svn/slsDetectorGui"
 //#define SVNREPPATH ""
 #define SVNREPUUID "af1100a4-978c-4157-bff7-07162d2ba061"
-//#define SVNREV 0x230
+//#define SVNREV 0x233
 //#define SVNKIND ""
 //#define SVNSCHED ""
 #define SVNAUTH "l_maliakal_d"
-#define SVNREV 0x230
-#define SVNDATE 0x20130827
+#define SVNREV 0x233
+#define SVNDATE 0x20130829
 //
diff --git a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
index 0e9de4649..db5141078 100644
--- a/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
+++ b/slsDetectorGui/slsDetectorPlotting/include/SlsQt1DPlot.h
@@ -136,7 +136,7 @@ class SlsQt1DPlot:public QwtPlot{
   void SetZoom(double xmin,double ymin,double x_width,double y_width);
   void SetZoomBase(double xmin,double ymin,double x_width, double y_width){ zoomer->SetZoomBase(xmin,ymin,x_width,y_width);}
 
-
+  void alignScales();
  private:
   
   SlsQtH1DList*     hist_list;
@@ -148,7 +148,7 @@ class SlsQt1DPlot:public QwtPlot{
   
   void SetupZoom();
   void UnknownStuff();
-  void alignScales();
+  //void alignScales();
   
   void CalculateNResetZoomBase();
   void NewHistogramAttached(SlsQtH1D* h);
diff --git a/slsDetectorGui/src/qDrawPlot.cpp b/slsDetectorGui/src/qDrawPlot.cpp
index d4b0bb466..3d182bb9d 100644
--- a/slsDetectorGui/src/qDrawPlot.cpp
+++ b/slsDetectorGui/src/qDrawPlot.cpp
@@ -1266,7 +1266,7 @@ void qDrawPlot::UpdatePlot(){
 								//h->setTitle(GetHistTitle(hist_num));
 								h->Attach(plot1D);
 								//refixing all the zooming
-								if(firstPlot){
+								if((firstPlot) || (anglePlot)){
 									plot1D->SetXMinMax(h->minXValue(),h->maxXValue());
 									plot1D->SetYMinMax(h->minYValue(),h->maxYValue());
 									plot1D->SetZoomBase(h->minXValue(),h->minYValue(),
@@ -1274,6 +1274,7 @@ void qDrawPlot::UpdatePlot(){
 									firstPlot = false;
 								}
 							}
+
 						}
 						// update range if required
 						if(XYRangeChanged){
diff --git a/slsDetectorGui/src/qTabDataOutput.cpp b/slsDetectorGui/src/qTabDataOutput.cpp
index 758887a60..213383d21 100644
--- a/slsDetectorGui/src/qTabDataOutput.cpp
+++ b/slsDetectorGui/src/qTabDataOutput.cpp
@@ -405,6 +405,7 @@ void qTabDataOutput::UpdateRateCorrectionFromServer(){
 
 
 void qTabDataOutput::SetAngularCorrection(){
+	disconnect(chkAngular,			SIGNAL(toggled(bool)), 	this, 	SLOT(SetAngularCorrection()));
 #ifdef VERYVERBOSE
 	cout << "Entering Set Angular Correction function" << endl;
 #endif
@@ -414,18 +415,28 @@ void qTabDataOutput::SetAngularCorrection(){
 		cout << "Setting angular conversion to default"  << endl;
 #endif
 		}else{
+#ifdef VERBOSE
+		cout << "Could not set angular conversion to default"  << endl;
+#endif
 			qDefs::Message(qDefs::WARNING,"Angular Conversion could not be set. Please set the default file name using the command line, if you haven't already.","qTabDataOutput::SetAngularCorrection");
 			chkAngular->setChecked(false);
 		}
 	}else{
-		myDet->setAngularConversionFile("");
+		if(myDet->setAngularConversionFile("")){
+#ifdef VERBOSE
+		cout << "Could not reset angular correction" << endl;
+#endif
+			qDefs::Message(qDefs::WARNING,"Angular Conversion could not be reset.","qTabDataOutput::SetAngularCorrection");
+			chkAngular->setChecked(true);
+		}else{;
 #ifdef VERBOSE
 		cout << "Unsetting angular correction" << endl;
 #endif
+		}
 	}
 
 	emit AngularConversionSignal(chkAngular->isChecked());
-
+	connect(chkAngular,			SIGNAL(toggled(bool)), 	this, 	SLOT(SetAngularCorrection()));
 	qDefs::checkErrorMessage(myDet,"qTabDataOutput::SetAngularCorrection");
 }