diff --git a/Source/Ember/Ember.h b/Source/Ember/Ember.h
index 6e3e3ee..da0726e 100644
--- a/Source/Ember/Ember.h
+++ b/Source/Ember/Ember.h
@@ -879,8 +879,8 @@ public:
 
 								if (tempParVar != nullptr && (parVar->ParamCount() == tempParVar->ParamCount()))//This check will should always be true, but just check to be absolutely sure to avoid clobbering memory.
 								{
-									ParamWithName<T>* params = parVar->Params();
-									ParamWithName<T>* tempParams = tempParVar->Params();
+									auto params = parVar->Params();
+									auto tempParams = tempParVar->Params();
 
 									for (l = 0; l < parVar->ParamCount(); l++)
 									{
diff --git a/Source/Ember/EmberToXml.h b/Source/Ember/EmberToXml.h
index 1b68219..9d6cbf1 100644
--- a/Source/Ember/EmberToXml.h
+++ b/Source/Ember/EmberToXml.h
@@ -529,7 +529,7 @@ private:
 
 				if (parVar)
 				{
-					ParamWithName<T>* params = parVar->Params();
+					auto params = parVar->Params();
 
 					for (j = 0; j < parVar->ParamCount(); j++)
 					{
diff --git a/Source/Ember/Interpolate.h b/Source/Ember/Interpolate.h
index ca728e0..23b16d2 100644
--- a/Source/Ember/Interpolate.h
+++ b/Source/Ember/Interpolate.h
@@ -547,18 +547,18 @@ public:
 		if (second != nullptr && first.size() == c.size())
 		{
 			second->Clear();
-			ParamWithName<T>* secondParams = second->Params();
+			auto secondParams = second->Params();
 
 			//Iterate through each of the source variations.
 			for (size_t i = 0; i < first.size(); i++)
 			{
-				ParametricVariation<T>* firstVar = first[i];
+				auto firstVar = first[i];
 
 				//Make sure the source variation at this index is the same type as the variation being written to.
 				if (firstVar->VariationId() == second->VariationId())
 				{
 					size_t size = firstVar->ParamCount();
-					ParamWithName<T>* firstParams = firstVar->Params();
+					auto firstParams = firstVar->Params();
 
 					//Multiply each parameter of the variation at this index by the coefficient at this index, and add
 					//the result to the corresponding parameter in second.
diff --git a/Source/Ember/Renderer.cpp b/Source/Ember/Renderer.cpp
index a8de9d9..4b1a12e 100644
--- a/Source/Ember/Renderer.cpp
+++ b/Source/Ember/Renderer.cpp
@@ -607,7 +607,9 @@ FilterAndAccum:
 AccumOnly:
 	if (m_ProcessState == FILTER_DONE || forceOutput)
 	{
-		if (m_Callback && !m_Callback->ProgressFunc(m_Ember, m_ProgressParameter, 0, 2, 0))//Original only allowed stages 0 and 1. Add 2 to mean final accum.
+		//Original only allowed stages 0 and 1. Add 2 to mean final accum.
+		//Do not update state/progress on forced output because it will be immediately overwritten.
+		if (m_Callback && !forceOutput && !m_Callback->ProgressFunc(m_Ember, m_ProgressParameter, 0, 2, 0))
 		{
 			Abort();
 			success = RENDER_ABORT;
diff --git a/Source/Ember/Variation.h b/Source/Ember/Variation.h
index d146e89..500b02d 100644
--- a/Source/Ember/Variation.h
+++ b/Source/Ember/Variation.h
@@ -1232,7 +1232,7 @@ public:
 	/// Abstract copy function. Derived classes must implement.
 	/// </summary>
 	/// <returns>A copy of this object</returns>
-	virtual Variation<T>* Copy() = 0;
+	virtual Variation<T>* Copy() const = 0;
 
 	/// <summary>
 	/// Create a new Variation<float>, store it in the pointer reference passed in and
@@ -1695,7 +1695,7 @@ public:
 	/// </summary>
 	/// <param name="name">The name to search for</param>
 	/// <returns>A pointer to the parameter value if the name matched, else false.</returns>
-	T* GetParam(const char* name)
+	T* GetParam(const char* name) const
 	{
 		for (auto& param : m_Params)
 			if (!_stricmp(param.Name().c_str(), name))
@@ -1825,8 +1825,8 @@ public:
 	/// <summary>
 	/// Accessors.
 	/// </summary>
-	ParamWithName<T>* Params() { return &m_Params[0]; }
-	size_t ParamCount() { return m_Params.size(); }
+	const ParamWithName<T>* Params() const { return &m_Params[0]; }
+	size_t ParamCount() const { return m_Params.size(); }
 	const vector<ParamWithName<T>>& ParamsVec() const { return m_Params; }
 
 protected:
@@ -1898,7 +1898,7 @@ protected:
 	{ \
 	} \
 	\
-	virtual Variation<T>* Copy() override \
+	virtual Variation<T>* Copy() const override \
 	{ \
 		return new name<T>(*this); \
 	} \
@@ -1925,7 +1925,7 @@ protected:
 	{ \
 	} \
 	\
-	virtual Variation<T>* Copy() override \
+	virtual Variation<T>* Copy() const override \
 	{ \
 		return new name<T>(*this); \
 	} \
@@ -2011,7 +2011,7 @@ protected:
 		CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \
 	} \
 	\
-	virtual Variation<T>* Copy() override \
+	virtual Variation<T>* Copy() const override \
 	{ \
 		return new name<T>(*this); \
 	} \
@@ -2042,7 +2042,7 @@ protected:
 		CopyParamVals(var.ParamsVec()); /* Copy values from var's vector and precalc. */ \
 	} \
 	\
-	virtual Variation<T>* Copy() override \
+	virtual Variation<T>* Copy() const override \
 	{ \
 		return new name<T>(*this); \
 	} \
diff --git a/Source/Ember/VariationList.h b/Source/Ember/VariationList.h
index 31c4a34..9e53a53 100644
--- a/Source/Ember/VariationList.h
+++ b/Source/Ember/VariationList.h
@@ -375,7 +375,7 @@ public:
 	/// </summary>
 	/// <param name="index">The index in the list to retrieve</param>
 	/// <returns>A pointer to the variation at the index if in range, else nullptr.</returns>
-	Variation<T>* GetVariation(size_t index) { return index < m_Variations.size() ? m_Variations[index] : nullptr; }
+	const Variation<T>* GetVariation(size_t index) const { return index < m_Variations.size() ? m_Variations[index] : nullptr; }
 
 	/// <summary>
 	/// Get a pointer to the variation of a specified type at the specified index.
@@ -383,7 +383,7 @@ public:
 	/// <param name="index">The index in the list to retrieve</param>
 	/// <param name="varType">The type of variation to retrieve</param>
 	/// <returns>A pointer to the variation of the specified type at the index if in range, else nullptr.</returns>
-	Variation<T>* GetVariation(size_t index, eVariationType varType)
+	const Variation<T>* GetVariation(size_t index, eVariationType varType) const
 	{
 		if (varType == VARTYPE_REG)
 			return index < m_RegVariations.size() ? m_RegVariations[index] : nullptr;
@@ -402,15 +402,15 @@ public:
 	/// <param name="index">The index in the list to make a copy of</param>
 	/// <param name="weight">The weight to assign the new copy. Default: 1</param>
 	/// <returns>A pointer to the variation at the index if in range, else nullptr.</returns>
-	Variation<T>* GetVariationCopy(size_t index, T weight = 1) { return MakeCopyWithWeight(GetVariation(index), weight); }
-	Variation<T>* GetVariationCopy(size_t index, eVariationType varType, T weight = 1) { return MakeCopyWithWeight(GetVariation(index, varType), weight); }
+	Variation<T>* GetVariationCopy(size_t index, T weight = 1) const { return MakeCopyWithWeight(GetVariation(index), weight); }
+	Variation<T>* GetVariationCopy(size_t index, eVariationType varType, T weight = 1) const { return MakeCopyWithWeight(GetVariation(index, varType), weight); }
 
 	/// <summary>
 	/// Get a pointer to the variation with the specified ID.
 	/// </summary>
 	/// <param name="id">The ID to search for</param>
 	/// <returns>A pointer to the variation if found, else nullptr.</returns>
-	Variation<T>* GetVariation(eVariationId id)
+	const Variation<T>* GetVariation(eVariationId id) const
 	{
 		for (uint i = 0; i < m_Variations.size() && m_Variations[i] != nullptr; i++)
 			if (id == m_Variations[i]->VariationId())
@@ -426,14 +426,14 @@ public:
 	/// <param name="id">The id of the variation in the list to make a copy of</param>
 	/// <param name="weight">The weight to assign the new copy. Default: 1</param>
 	/// <returns>A pointer to the variation with a matching ID, else nullptr.</returns>
-	Variation<T>* GetVariationCopy(eVariationId id, T weight = 1) { return MakeCopyWithWeight(GetVariation(id), weight); }
+	Variation<T>* GetVariationCopy(eVariationId id, T weight = 1) const { return MakeCopyWithWeight(GetVariation(id), weight); }
 
 	/// <summary>
 	/// Get a pointer to the variation with the specified name.
 	/// </summary>
 	/// <param name="name">The name to search for</param>
 	/// <returns>A pointer to the variation if found, else nullptr.</returns>
-	Variation<T>* GetVariation(const string& name)
+	const Variation<T>* GetVariation(const string& name) const
 	{
 		for (uint i = 0; i < m_Variations.size() && m_Variations[i] != nullptr; i++)
 			if (!_stricmp(name.c_str(), m_Variations[i]->Name().c_str()))
@@ -449,7 +449,7 @@ public:
 	/// <param name="name">The name of the variation in the list to make a copy of</param>
 	/// <param name="weight">The weight to assign the new copy. Default: 1</param>
 	/// <returns>A pointer to the variation with a matching name, else nullptr.</returns>
-	Variation<T>* GetVariationCopy(const string& name, T weight = 1) { return MakeCopyWithWeight(GetVariation(name), weight); }
+	Variation<T>* GetVariationCopy(const string& name, T weight = 1) const { return MakeCopyWithWeight(GetVariation(name), weight); }
 
 	/// <summary>
 	/// Get a parametric variation at the specified index.
@@ -457,14 +457,14 @@ public:
 	/// </summary>
 	/// <param name="index">The index in the parametric variations list to retrieve</param>
 	/// <returns>The parametric variation at the index specified if in range, else nullptr.</returns>
-	ParametricVariation<T>* GetParametricVariation(size_t index) { return index < m_ParametricVariations.size() ? m_ParametricVariations[index] : nullptr; }
+	const ParametricVariation<T>* GetParametricVariation(size_t index) const { return index < m_ParametricVariations.size() ? m_ParametricVariations[index] : nullptr; }
 
 	/// <summary>
 	/// Get a parametric variation with the specified name.
 	/// </summary>
 	/// <param name="name">The name of the variation in the parametric variations list to retrieve</param>
 	/// <returns>The parametric variation with a matching name, else nullptr.</returns>
-	ParametricVariation<T>* GetParametricVariation(const string& name)
+	const ParametricVariation<T>* GetParametricVariation(const string& name) const
 	{
 		for (uint i = 0; i < m_ParametricVariations.size() && m_ParametricVariations[i] != nullptr; i++)
 			if (!_stricmp(name.c_str(), m_ParametricVariations[i]->Name().c_str()))
@@ -490,11 +490,11 @@ public:
 	/// <summary>
 	/// Accessors.
 	/// </summary>
-	size_t Size() { return m_Variations.size(); }
-	size_t RegSize() { return m_RegVariations.size(); }
-	size_t PreSize() { return m_PreVariations.size(); }
-	size_t PostSize() { return m_PostVariations.size(); }
-	size_t ParametricSize() { return m_ParametricVariations.size(); }
+	size_t Size() const { return m_Variations.size(); }
+	size_t RegSize() const { return m_RegVariations.size(); }
+	size_t PreSize() const { return m_PreVariations.size(); }
+	size_t PostSize() const { return m_PostVariations.size(); }
+	size_t ParametricSize() const { return m_ParametricVariations.size(); }
 
 private:
 	/// <summary>
@@ -504,7 +504,7 @@ private:
 	/// <param name="var">The variation to copy</param>
 	/// <param name="weight">The weight to assign it</param>
 	/// <returns>A pointer to the new variation copy if success, else nullptr.</returns>
-	Variation<T>* MakeCopyWithWeight(Variation<T>* var, T weight)
+	Variation<T>* MakeCopyWithWeight(const Variation<T>* var, T weight) const
 	{
 		if (var)
 		{
diff --git a/Source/Ember/Xform.h b/Source/Ember/Xform.h
index e676a34..08f0c96 100644
--- a/Source/Ember/Xform.h
+++ b/Source/Ember/Xform.h
@@ -766,9 +766,9 @@ public:
 				//Now apply the motion func to the params if needed.
 				if (motParVar != nullptr)
 				{
-					ParametricVariation<T>* parVar = dynamic_cast<ParametricVariation<T>*>(var);
-					ParamWithName<T>* params = parVar->Params();
-					ParamWithName<T>* motParams = motParVar->Params();
+					auto parVar = dynamic_cast<ParametricVariation<T>*>(var);
+					auto params = parVar->Params();
+					auto motParams = motParVar->Params();
 
 					for (size_t k = 0; k < motParVar->ParamCount(); k++)
 					{
diff --git a/Source/Ember/XmlToEmber.h b/Source/Ember/XmlToEmber.h
index 078389d..07ea62f 100644
--- a/Source/Ember/XmlToEmber.h
+++ b/Source/Ember/XmlToEmber.h
@@ -1154,9 +1154,9 @@ private:
 				//Only correct names if it came from an outside source. Names originating from this library are always considered correct.
 				string s = fromEmber ? string(CCX(curAtt->name)) : GetCorrectedVariationName(m_BadVariationNames, curAtt);
 
-				if (Variation<T>* var = m_VariationList.GetVariation(s))
+				if (auto var = m_VariationList.GetVariation(s))
 				{
-					Variation<T>* varCopy = var->Copy();
+					auto varCopy = var->Copy();
 
 					Atof(attStr, varCopy->m_Weight);
 					xform.AddVariation(varCopy);
diff --git a/Source/EmberCL/RendererCL.cpp b/Source/EmberCL/RendererCL.cpp
index 03c7b62..1fb8a3f 100644
--- a/Source/EmberCL/RendererCL.cpp
+++ b/Source/EmberCL/RendererCL.cpp
@@ -945,7 +945,7 @@ eRenderStatus RendererCL<T>::RunLogScaleFilter()
 		m_ErrorReport.push_back(loc);
 	}
 
-	if (b && m_Callback)
+	if (b && m_Callback && m_LastIterPercent >= 99.0)//Only update progress if we've really reached the end, not via forced output.
 		m_Callback->ProgressFunc(m_Ember, m_ProgressParameter, 100.0, 1, 0.0);
 
 	return b ? RENDER_OK : RENDER_ERROR;
diff --git a/Source/EmberTester/EmberTester.cpp b/Source/EmberTester/EmberTester.cpp
index f386f0f..aea0b84 100644
--- a/Source/EmberTester/EmberTester.cpp
+++ b/Source/EmberTester/EmberTester.cpp
@@ -397,7 +397,7 @@ bool TestVarCounts()
 
 	for (; start < (uint)LAST_VAR; start++)
 	{
-		Variation<float>* var = vlf.GetVariation((eVariationId)start);
+		auto var = vlf.GetVariation((eVariationId)start);
 
 		if (!var)
 		{
@@ -603,7 +603,7 @@ bool TestVarPrePostNames()
 
 	for (size_t i = 0; i < vlf.Size(); i++)
 	{
-		Variation<float>* var = vlf.GetVariation(i);
+		auto var = vlf.GetVariation(i);
 		string name = var->Name();
 
 		if (var->VarType() == VARTYPE_REG)
@@ -643,7 +643,7 @@ bool TestVarPrePostNames()
 			break;
 		}
 
-		if (ParametricVariation<float>* parVar = dynamic_cast<ParametricVariation<float>*>(var))
+		if (auto parVar = dynamic_cast<ParametricVariation<float>*>(const_cast<Variation<float>*>(var)))
 		{
 			vector<ParamWithName<float>> params = parVar->ParamsVec();
 
@@ -699,7 +699,7 @@ bool TestParVars()
 
 	for (size_t i = 0; i < vlf.ParametricSize(); i++)
 	{
-		if (ParametricVariation<float>* parVar = vlf.GetParametricVariation(i))
+		if (auto parVar = vlf.GetParametricVariation(i))
 		{
 			if (parVar->ParamCount() < 1)
 			{
@@ -709,7 +709,7 @@ bool TestParVars()
 
 			vector<string> names;
 			vector<float*> addresses;
-			ParamWithName<float>* params = parVar->Params();
+			auto params = parVar->Params();
 
 			names.reserve(parVar->ParamCount());
 			addresses.reserve(parVar->ParamCount());
@@ -754,7 +754,7 @@ bool TestVarRegPrePost()
 
 	for (size_t i = 0; i < vlf.RegSize(); i++)
 	{
-		Variation<float>* regVar = vlf.GetVariation(i, VARTYPE_REG);
+		auto regVar = vlf.GetVariation(i, VARTYPE_REG);
 		
 		if (regVar)
 		{
@@ -762,8 +762,8 @@ bool TestVarRegPrePost()
 			{
 				string name = regVar->Name();
 
-				Variation<float>* preVar = vlf.GetVariation("pre_" + name);
-				Variation<float>* postVar = vlf.GetVariation("post_" + name);
+				auto preVar = vlf.GetVariation("pre_" + name);
+				auto postVar = vlf.GetVariation("post_" + name);
 
 				if (!preVar)
 				{
diff --git a/Source/Fractorium/FractoriumRender.cpp b/Source/Fractorium/FractoriumRender.cpp
index ea2cba6..5e25da7 100644
--- a/Source/Fractorium/FractoriumRender.cpp
+++ b/Source/Fractorium/FractoriumRender.cpp
@@ -369,7 +369,7 @@ bool FractoriumEmberController<T>::Render()
 	if (ProcessState() != ACCUM_DONE)
 	{
 		//if (m_Renderer->Run(m_FinalImage, 0) == RENDER_OK)//Full, non-incremental render for debugging.
-		if (m_Renderer->Run(m_FinalImage[m_FinalImageIndex], 0, m_SubBatchCount, iterBegin) == RENDER_OK)//Force output on iterBegin.
+		if (m_Renderer->Run(m_FinalImage[m_FinalImageIndex], 0, m_SubBatchCount, (iterBegin || m_Fractorium->m_Settings->ContinuousUpdate())) == RENDER_OK)//Force output on iterBegin or if the settings specify to always do it.
 		{
 			//The amount to increment sub batch while rendering proceeds is purely empirical.
 			//Change later if better values can be derived/observed.
diff --git a/Source/Fractorium/FractoriumSettings.cpp b/Source/Fractorium/FractoriumSettings.cpp
index 9219431..2770861 100644
--- a/Source/Fractorium/FractoriumSettings.cpp
+++ b/Source/Fractorium/FractoriumSettings.cpp
@@ -119,6 +119,9 @@ void FractoriumSettings::Double(bool b)						  { setValue(DOUBLEPRECISION, b);
 bool FractoriumSettings::ShowAllXforms()					  { return value(SHOWALLXFORMS).toBool();		 }
 void FractoriumSettings::ShowAllXforms(bool b)				  { setValue(SHOWALLXFORMS, b);					 }
 
+bool FractoriumSettings::ContinuousUpdate()					  { return value(CONTUPDATE).toBool();			 }
+void FractoriumSettings::ContinuousUpdate(bool b)			  { setValue(CONTUPDATE, b);					 }
+
 uint FractoriumSettings::PlatformIndex()              { return value(PLATFORMINDEX).toUInt();        }
 void FractoriumSettings::PlatformIndex(uint i)        { setValue(PLATFORMINDEX, i);                  }
 															  
diff --git a/Source/Fractorium/FractoriumSettings.h b/Source/Fractorium/FractoriumSettings.h
index 39500c5..35ec9cc 100644
--- a/Source/Fractorium/FractoriumSettings.h
+++ b/Source/Fractorium/FractoriumSettings.h
@@ -11,6 +11,7 @@
 #define TRANSPARENCY         "render/transparency"
 #define OPENCL               "render/opencl"
 #define DOUBLEPRECISION		 "render/dp64"
+#define CONTUPDATE			 "render/continuousupdate"
 #define SHOWALLXFORMS	     "render/dragshowallxforms"
 #define PLATFORMINDEX        "render/platformindex"
 #define DEVICEINDEX          "render/deviceindex"
@@ -89,6 +90,9 @@ public:
 	bool ShowAllXforms();
 	void ShowAllXforms(bool b);
 
+	bool ContinuousUpdate();
+	void ContinuousUpdate(bool b);
+
 	uint PlatformIndex();
 	void PlatformIndex(uint b);
 
diff --git a/Source/Fractorium/FractoriumXformsVariations.cpp b/Source/Fractorium/FractoriumXformsVariations.cpp
index cbd43fc..85b7b09 100644
--- a/Source/Fractorium/FractoriumXformsVariations.cpp
+++ b/Source/Fractorium/FractoriumXformsVariations.cpp
@@ -40,7 +40,7 @@ void FractoriumEmberController<T>::SetupVariationTree()
 	for (size_t i = 0; i < m_VariationList.Size(); i++)
 	{
 		auto var = m_VariationList.GetVariation(i);
-		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);
+		auto parVar = dynamic_cast<const ParametricVariation<T>*>(var);
 
 		//First add the variation, with a spinner for its weight.
 		auto item = new VariationTreeWidgetItem(var->VariationId(), tree);
@@ -61,7 +61,7 @@ void FractoriumEmberController<T>::SetupVariationTree()
 		//Check to see if the variation was parametric, and add a tree entry with a spinner for each parameter.
 		if (parVar)
 		{
-			ParamWithName<T>* params = parVar->Params();
+			auto params = parVar->Params();
 
 			for (size_t j = 0; j < parVar->ParamCount(); j++)
 			{
@@ -138,7 +138,7 @@ void FractoriumEmberController<T>::VariationSpinBoxValueChanged(double d)//Would
 	if (sender && xform)
 	{
 		auto var = m_VariationList.GetVariation(sender->GetVariationId());//The variation attached to the sender, for reference only.
-		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);//The parametric cast of that variation.
+		auto parVar = dynamic_cast<const ParametricVariation<T>*>(var);//The parametric cast of that variation.
 		auto xformVar = xform->GetVariationById(var->VariationId());//The corresponding variation in the currently selected xform.
 		auto widgetItem = sender->WidgetItem();
 		bool isParam = parVar && sender->IsParam();
@@ -227,7 +227,7 @@ void FractoriumEmberController<T>::FillVariationTreeWithXform(Xform<T>* xform)
 		auto item = dynamic_cast<VariationTreeWidgetItem*>(tree->topLevelItem(i));
 		auto var = xform->GetVariationById(item->Id());//See if this variation in the tree was contained in the xform.
 		auto parVar = dynamic_cast<ParametricVariation<T>*>(var);//Attempt cast to parametric variation for later.
-		auto origParVar = dynamic_cast<ParametricVariation<T>*>(m_VariationList.GetVariation(item->Id()));
+		auto origParVar = dynamic_cast<const ParametricVariation<T>*>(m_VariationList.GetVariation(item->Id()));
 
 		if (auto spinBox = dynamic_cast<VariationTreeDoubleSpinBox*>(tree->itemWidget(item, 1)))//Get the widget for the item, and cast the widget to the VariationTreeDoubleSpinBox type.
 		{
diff --git a/Source/Fractorium/OptionsDialog.cpp b/Source/Fractorium/OptionsDialog.cpp
index 90f8953..6a67406 100644
--- a/Source/Fractorium/OptionsDialog.cpp
+++ b/Source/Fractorium/OptionsDialog.cpp
@@ -65,12 +65,13 @@ FractoriumOptionsDialog::FractoriumOptionsDialog(FractoriumSettings* settings, Q
 		ui.OpenCLCheckBox->setEnabled(false);
 	}
 
-	ui.EarlyClipCheckBox->setChecked(	   m_Settings->EarlyClip());
-	ui.YAxisUpCheckBox->setChecked(		   m_Settings->YAxisUp());
-	ui.TransparencyCheckBox->setChecked(   m_Settings->Transparency());
-	ui.DoublePrecisionCheckBox->setChecked(m_Settings->Double());
-	ui.ShowAllXformsCheckBox->setChecked(  m_Settings->ShowAllXforms());
-	ui.ThreadCountSpin->setValue(		   m_Settings->ThreadCount());
+	ui.EarlyClipCheckBox->setChecked(	    m_Settings->EarlyClip());
+	ui.YAxisUpCheckBox->setChecked(		    m_Settings->YAxisUp());
+	ui.TransparencyCheckBox->setChecked(    m_Settings->Transparency());
+	ui.ContinuousUpdateCheckBox->setChecked(m_Settings->ContinuousUpdate());
+	ui.DoublePrecisionCheckBox->setChecked( m_Settings->Double());
+	ui.ShowAllXformsCheckBox->setChecked(   m_Settings->ShowAllXforms());
+	ui.ThreadCountSpin->setValue(		    m_Settings->ThreadCount());
 	
 	if (m_Settings->CpuDEFilter())
 		ui.CpuFilteringDERadioButton->setChecked(true);
@@ -100,6 +101,7 @@ FractoriumOptionsDialog::FractoriumOptionsDialog(FractoriumSettings* settings, Q
 bool FractoriumOptionsDialog::EarlyClip() { return ui.EarlyClipCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::YAxisUp() { return ui.YAxisUpCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::Transparency() { return ui.TransparencyCheckBox->isChecked(); }
+bool FractoriumOptionsDialog::ContinuousUpdate() { return ui.ContinuousUpdateCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::OpenCL() { return ui.OpenCLCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::Double() { return ui.DoublePrecisionCheckBox->isChecked(); }
 bool FractoriumOptionsDialog::ShowAllXforms() { return ui.ShowAllXformsCheckBox->isChecked(); }
@@ -152,6 +154,7 @@ void FractoriumOptionsDialog::accept()
 	m_Settings->EarlyClip(EarlyClip());
 	m_Settings->YAxisUp(YAxisUp());
 	m_Settings->Transparency(Transparency());
+	m_Settings->ContinuousUpdate(ContinuousUpdate());
 	m_Settings->OpenCL(OpenCL());
 	m_Settings->Double(Double());
 	m_Settings->ShowAllXforms(ShowAllXforms());
@@ -187,6 +190,7 @@ void FractoriumOptionsDialog::reject()
 	ui.EarlyClipCheckBox->setChecked(m_Settings->EarlyClip());
 	ui.YAxisUpCheckBox->setChecked(m_Settings->YAxisUp());
 	ui.TransparencyCheckBox->setChecked(m_Settings->Transparency());
+	ui.ContinuousUpdateCheckBox->setChecked(m_Settings->ContinuousUpdate());
 	ui.OpenCLCheckBox->setChecked(m_Settings->OpenCL());
 	ui.DoublePrecisionCheckBox->setChecked(m_Settings->Double());
 	ui.ShowAllXformsCheckBox->setChecked(m_Settings->ShowAllXforms());
diff --git a/Source/Fractorium/OptionsDialog.h b/Source/Fractorium/OptionsDialog.h
index 81d3269..6385fd7 100644
--- a/Source/Fractorium/OptionsDialog.h
+++ b/Source/Fractorium/OptionsDialog.h
@@ -37,6 +37,7 @@ private:
 	bool YAxisUp();
 	bool AlphaChannel();
 	bool Transparency();
+	bool ContinuousUpdate();
 	bool OpenCL();
 	bool Double();
 	bool ShowAllXforms();
diff --git a/Source/Fractorium/OptionsDialog.ui b/Source/Fractorium/OptionsDialog.ui
index 1a8fdb3..9c1a92a 100644
--- a/Source/Fractorium/OptionsDialog.ui
+++ b/Source/Fractorium/OptionsDialog.ui
@@ -113,13 +113,13 @@
          </property>
         </widget>
        </item>
-       <item row="5" column="0" colspan="2">
+       <item row="6" column="0" colspan="2">
         <widget class="QComboBox" name="PlatformCombo"/>
        </item>
-       <item row="6" column="0" colspan="2">
+       <item row="7" column="0" colspan="2">
         <widget class="QComboBox" name="DeviceCombo"/>
        </item>
-       <item row="7" column="0">
+       <item row="8" column="0">
         <widget class="QSpinBox" name="ThreadCountSpin">
          <property name="toolTip">
           <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The number of threads to use with CPU rendering.&lt;/p&gt;&lt;p&gt;Decrease for more responsive editing, increase for better performance.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
@@ -135,7 +135,7 @@
          </property>
         </widget>
        </item>
-       <item row="10" column="0">
+       <item row="11" column="0">
         <widget class="QGroupBox" name="InteraciveCpuFilteringGroupBox">
          <property name="title">
           <string>CPU Filtering</string>
@@ -182,7 +182,7 @@
          </layout>
         </widget>
        </item>
-       <item row="11" column="0">
+       <item row="12" column="0">
         <widget class="QGroupBox" name="InteraciveGpuFilteringGroupBox">
          <property name="title">
           <string>OpenCL Filtering</string>
@@ -226,7 +226,7 @@
          </layout>
         </widget>
        </item>
-       <item row="8" column="0">
+       <item row="9" column="0">
         <widget class="QSpinBox" name="CpuSubBatchSpin">
          <property name="toolTip">
           <string>The number of 10,000 iteration chunks ran per thread on the CPU
@@ -243,7 +243,7 @@ in interactive mode for each mouse movement</string>
          </property>
         </widget>
        </item>
-       <item row="9" column="0">
+       <item row="10" column="0">
         <widget class="QSpinBox" name="OpenCLSubBatchSpin">
          <property name="toolTip">
           <string>The number of ~8M iteration chunks ran using OpenCL
@@ -300,6 +300,16 @@ in interactive mode for each mouse movement</string>
          </property>
         </widget>
        </item>
+       <item row="3" column="0">
+        <widget class="QCheckBox" name="ContinuousUpdateCheckBox">
+         <property name="toolTip">
+          <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Continually update output image during interactive rendering.&lt;/p&gt;&lt;p&gt;This will slow down performance, but will give continuous updates on how the final render will look. Note that only log scale filtering is applied on each update. Full DE is not applied until iteration is complete.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+         </property>
+         <property name="text">
+          <string>Continuous Update</string>
+         </property>
+        </widget>
+       </item>
       </layout>
      </widget>
      <widget class="QWidget" name="OptionsXmlSavingTab">
@@ -716,11 +726,12 @@ in interactive mode for each mouse movement</string>
  </customwidgets>
  <tabstops>
   <tabstop>EarlyClipCheckBox</tabstop>
-  <tabstop>YAxisUpCheckBox</tabstop>
-  <tabstop>TransparencyCheckBox</tabstop>
   <tabstop>OpenCLCheckBox</tabstop>
+  <tabstop>YAxisUpCheckBox</tabstop>
   <tabstop>DoublePrecisionCheckBox</tabstop>
+  <tabstop>TransparencyCheckBox</tabstop>
   <tabstop>ShowAllXformsCheckBox</tabstop>
+  <tabstop>ContinuousUpdateCheckBox</tabstop>
   <tabstop>PlatformCombo</tabstop>
   <tabstop>DeviceCombo</tabstop>
   <tabstop>ThreadCountSpin</tabstop>
@@ -730,9 +741,7 @@ in interactive mode for each mouse movement</string>
   <tabstop>CpuFilteringDERadioButton</tabstop>
   <tabstop>OpenCLFilteringLogRadioButton</tabstop>
   <tabstop>OpenCLFilteringDERadioButton</tabstop>
-  <tabstop>OptionsXmlSavingTable</tabstop>
-  <tabstop>OptionsIdentityTable</tabstop>
-  <tabstop>OptionsButtonBox</tabstop>
+  <tabstop>AutoUniqueCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections>