diff --git a/CUEControls/Properties/AssemblyInfo.cs b/CUEControls/Properties/AssemblyInfo.cs
index 574607d..0d97d7e 100644
--- a/CUEControls/Properties/AssemblyInfo.cs
+++ b/CUEControls/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUEPlayer/Properties/AssemblyInfo.cs b/CUEPlayer/Properties/AssemblyInfo.cs
index 25b1535..62de579 100644
--- a/CUEPlayer/Properties/AssemblyInfo.cs
+++ b/CUEPlayer/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUEPlayer/frmCUEPlayer.Designer.cs b/CUEPlayer/frmCUEPlayer.Designer.cs
index bfc65c8..7e42218 100644
--- a/CUEPlayer/frmCUEPlayer.Designer.cs
+++ b/CUEPlayer/frmCUEPlayer.Designer.cs
@@ -68,7 +68,7 @@
 			this.IsMdiContainer = true;
 			this.MainMenuStrip = this.menuStrip1;
 			this.Name = "frmCUEPlayer";
-			this.Text = "CUEPlayer 2.1.1";
+			this.Text = "CUEPlayer 2.1.2";
 			this.Load += new System.EventHandler(this.frmCUEPlayer_Load);
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmCUEPlayer_FormClosing);
 			this.menuStrip1.ResumeLayout(false);
diff --git a/CUERipper/CUERipper.csproj b/CUERipper/CUERipper.csproj
index d71ff63..fa617ee 100644
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -40,7 +40,7 @@
     <CreateWebPageOnPublish>true</CreateWebPageOnPublish>
     <WebPage>index.html</WebPage>
     <ApplicationRevision>2</ApplicationRevision>
-    <ApplicationVersion>2.1.1.0</ApplicationVersion>
+    <ApplicationVersion>2.1.2.0</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
     <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
diff --git a/CUERipper/frmCUERipper.cs b/CUERipper/frmCUERipper.cs
index 79a07c1..fcd19dc 100644
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -19,7 +19,6 @@ using CUETools.Codecs;
 using CUETools.Processor;
 using CUETools.Ripper;
 using CUEControls;
-using MusicBrainz;
 using Freedb;
 
 namespace CUERipper
@@ -562,14 +561,26 @@ namespace CUERipper
 			SetupControls();
 		}
 
-		private void MusicBrainz_LookupProgress(object sender, XmlRequestEventArgs e)
+		//private void MusicBrainz_LookupProgress(object sender, XmlRequestEventArgs e)
+		//{
+		//    CheckStop();
+		//    //_progress.percentDisk = (1.0 + _progress.percentDisk) / 2;
+		//    //_progress.input = e.Uri.ToString();
+		//    this.BeginInvoke((MethodInvoker)delegate()
+		//    {
+		//        toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " " + (e == null ? "FreeDB" : "MusicBrainz") + "...";
+		//        toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3;
+		//    });
+		//}
+
+		private void FreeDB_LookupProgress(object sender)
 		{
 			CheckStop();
 			//_progress.percentDisk = (1.0 + _progress.percentDisk) / 2;
 			//_progress.input = e.Uri.ToString();
 			this.BeginInvoke((MethodInvoker)delegate()
 			{
-				toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " " + (e == null ? "FreeDB" : "MusicBrainz") + "...";
+				toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " FreeDB...";
 				toolStripProgressBar1.Value = (100 + 2 * toolStripProgressBar1.Value) / 3;
 			});
 		}
@@ -581,12 +592,12 @@ namespace CUERipper
 			return entry;
 		}
 
-		private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release)
-		{
-			CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz");
-			entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1);
-			return entry;
-		}
+		//private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, Release release)
+		//{
+		//    CUEMetadataEntry entry = new CUEMetadataEntry(audioSource.TOC, "musicbrainz");
+		//    entry.metadata.FillFromMusicBrainz(release, entry.TOC.FirstAudio - 1);
+		//    return entry;
+		//}
 
 		private CUEMetadataEntry CreateCUESheet(ICDRipper audioSource, CDEntry cdEntry)
 		{
@@ -651,33 +662,34 @@ namespace CUERipper
 			{
 				loadAllMetadata = false;
 
-				this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " MusicBrainz..."; });
+				//this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " MusicBrainz..."; });
 
-				ReleaseQueryParameters p = new ReleaseQueryParameters();
-				p.DiscId = audioSource.TOC.MusicBrainzId;
-				Query<Release> results = Release.Query(p);
-				MusicBrainzService.Proxy = _config.GetProxy();
-				MusicBrainzService.XmlRequest += new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
+				//ReleaseQueryParameters p = new ReleaseQueryParameters();
+				//p.DiscId = audioSource.TOC.MusicBrainzId;
+				//Query<Release> results = Release.Query(p);
+				//MusicBrainzService.Proxy = _config.GetProxy();
+				//MusicBrainzService.XmlRequest += new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
 
-				try
-				{
-					foreach (Release release in results)
-					{
-						release.GetEvents();
-						release.GetTracks();
-						data.Releases.Add(CreateCUESheet(audioSource, release));
-					}
-					mbresults_count = results.Count;
-				}
-				catch (Exception ex)
-				{
-					System.Diagnostics.Trace.WriteLine(ex.Message);
-					if (!(ex is MusicBrainzNotFoundException))
-						musicbrainzError = ex.Message;
-				}
-				MusicBrainzService.Proxy = null;
-				MusicBrainzService.XmlRequest -= new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
+				//try
+				//{
+				//    foreach (Release release in results)
+				//    {
+				//        release.GetEvents();
+				//        release.GetTracks();
+				//        data.Releases.Add(CreateCUESheet(audioSource, release));
+				//    }
+				//    mbresults_count = results.Count;
+				//}
+				//catch (Exception ex)
+				//{
+				//    System.Diagnostics.Trace.WriteLine(ex.Message);
+				//    if (!(ex is MusicBrainzNotFoundException))
+				//        musicbrainzError = ex.Message;
+				//}
+				//MusicBrainzService.Proxy = null;
+				//MusicBrainzService.XmlRequest -= new EventHandler<XmlRequestEventArgs>(MusicBrainz_LookupProgress);
 
+				this.BeginInvoke((MethodInvoker)delegate() { toolStripStatusLabel1.Text = Properties.Resources.LookingUpVia + " Freedb..."; });
 
 				FreedbHelper m_freedb = new FreedbHelper();
 				m_freedb.Proxy = _config.GetProxy(); 
@@ -692,12 +704,12 @@ namespace CUERipper
 				string code = string.Empty;
 				try
 				{
-					MusicBrainz_LookupProgress(this, null);
+					FreeDB_LookupProgress(this);
 					code = m_freedb.Query(AccurateRipVerify.CalculateCDDBQuery(audioSource.TOC), out queryResult, out coll);
 					if (code == FreedbHelper.ResponseCodes.CODE_200)
 					{
 						CDEntry cdEntry;
-						MusicBrainz_LookupProgress(this, null);
+						FreeDB_LookupProgress(this);
 						code = m_freedb.Read(queryResult, out cdEntry);
 						if (code == FreedbHelper.ResponseCodes.CODE_210)
 						{
@@ -712,7 +724,7 @@ namespace CUERipper
 							foreach (QueryResult qr in coll)
 							{
 								CDEntry cdEntry;
-								MusicBrainz_LookupProgress(this, null);
+								FreeDB_LookupProgress(this);
 								code = m_freedb.Read(qr, out cdEntry);
 								if (code == FreedbHelper.ResponseCodes.CODE_210)
 								{
diff --git a/CUERipper/frmCUERipper.de-DE.resx b/CUERipper/frmCUERipper.de-DE.resx
index 1f41acd..cf768c7 100644
--- a/CUERipper/frmCUERipper.de-DE.resx
+++ b/CUERipper/frmCUERipper.de-DE.resx
@@ -208,6 +208,6 @@
     <value>Senden</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>CUERipper 2.1.1</value>
+    <value>CUERipper 2.1.2</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/CUERipper/frmCUERipper.resx b/CUERipper/frmCUERipper.resx
index 2cea35e..93f070a 100644
--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -468,7 +468,7 @@
     <value>bnComboBoxLosslessOrNot</value>
   </data>
   <data name="&gt;&gt;bnComboBoxLosslessOrNot.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxLosslessOrNot.Parent" xml:space="preserve">
     <value>groupBoxSettings</value>
@@ -495,7 +495,7 @@
     <value>bnComboBoxEncoder</value>
   </data>
   <data name="&gt;&gt;bnComboBoxEncoder.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxEncoder.Parent" xml:space="preserve">
     <value>groupBoxSettings</value>
@@ -549,7 +549,7 @@
     <value>bnComboBoxFormat</value>
   </data>
   <data name="&gt;&gt;bnComboBoxFormat.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxFormat.Parent" xml:space="preserve">
     <value>groupBoxSettings</value>
@@ -615,7 +615,7 @@
     <value>bnComboBoxImage</value>
   </data>
   <data name="&gt;&gt;bnComboBoxImage.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxImage.Parent" xml:space="preserve">
     <value>groupBoxSettings</value>
@@ -1011,7 +1011,7 @@
     <value>bnComboBoxRelease</value>
   </data>
   <data name="&gt;&gt;bnComboBoxRelease.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxRelease.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1035,7 +1035,7 @@
     <value>bnComboBoxDrives</value>
   </data>
   <data name="&gt;&gt;bnComboBoxDrives.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxDrives.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1059,7 +1059,7 @@
     <value>bnComboBoxOutputFormat</value>
   </data>
   <data name="&gt;&gt;bnComboBoxOutputFormat.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;bnComboBoxOutputFormat.Parent" xml:space="preserve">
     <value>$this</value>
@@ -1735,7 +1735,7 @@
     <value>CenterScreen</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>CUERipper 2.1.1</value>
+    <value>CUERipper 2.1.2</value>
   </data>
   <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
     <value>toolStripStatusLabel1</value>
diff --git a/CUERipper/frmFreedbSubmit.resx b/CUERipper/frmFreedbSubmit.resx
index e5256f0..f28f53f 100644
--- a/CUERipper/frmFreedbSubmit.resx
+++ b/CUERipper/frmFreedbSubmit.resx
@@ -138,7 +138,7 @@
     <value>imgComboBoxCategory</value>
   </data>
   <data name="&gt;&gt;imgComboBoxCategory.Type" xml:space="preserve">
-    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.ImgComboBox, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;imgComboBoxCategory.Parent" xml:space="preserve">
     <value>groupBox1</value>
diff --git a/CUETools.ARCUE/Properties/AssemblyInfo.cs b/CUETools.ARCUE/Properties/AssemblyInfo.cs
index 57b34d4..23bce34 100644
--- a/CUETools.ARCUE/Properties/AssemblyInfo.cs
+++ b/CUETools.ARCUE/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.AccurateRip/Properties/AssemblyInfo.cs b/CUETools.AccurateRip/Properties/AssemblyInfo.cs
index cee8c88..fc30b31 100644
--- a/CUETools.AccurateRip/Properties/AssemblyInfo.cs
+++ b/CUETools.AccurateRip/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.CDImage/Properties/AssemblyInfo.cs b/CUETools.CDImage/Properties/AssemblyInfo.cs
index b586691..f3457e5 100644
--- a/CUETools.CDImage/Properties/AssemblyInfo.cs
+++ b/CUETools.CDImage/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj b/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj
index a3978a7..abc02a1 100644
--- a/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj
+++ b/CUETools.CTDB.EACPlugin/CUETools.CTDB.EACPlugin.csproj
@@ -45,6 +45,12 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="FormSubmitParity.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="FormSubmitParity.Designer.cs">
+      <DependentUpon>FormSubmitParity.cs</DependentUpon>
+    </Compile>
     <Compile Include="FormMetadata.cs">
       <SubType>Form</SubType>
     </Compile>
@@ -67,6 +73,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="FormSubmitParity.resx">
+      <DependentUpon>FormSubmitParity.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="FormMetadata.resx">
       <DependentUpon>FormMetadata.cs</DependentUpon>
     </EmbeddedResource>
@@ -103,7 +112,7 @@
     <None Include="Resources\favicon.ico" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="Resources\ctdb.png" />
+    <None Include="Resources\ctdb64.png" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/CUETools.CTDB.EACPlugin/Metadata.cs b/CUETools.CTDB.EACPlugin/Metadata.cs
index 8e217ff..27abfba 100644
--- a/CUETools.CTDB.EACPlugin/Metadata.cs
+++ b/CUETools.CTDB.EACPlugin/Metadata.cs
@@ -42,7 +42,7 @@ namespace MetadataPlugIn
 			TOC[1][0].Start = 0U;
 
 			var ctdb = new CUEToolsDB(TOC, null);
-			var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.1");
+			var form = new CUETools.CTDB.EACPlugin.FormMetadata(ctdb, "EAC" + data.HostVersion + " CTDB 2.1.2");
 			form.ShowDialog();
 			var meta = form.Meta;
 			if (meta == null)
@@ -84,13 +84,13 @@ namespace MetadataPlugIn
 		public Array GetPluginLogo()
 		{
 			MemoryStream ms = new MemoryStream();
-            Resources.ctdb.Save(ms);
+			Resources.ctdb64.Save(ms, ImageFormat.Png);
 			return ms.ToArray();
 		}
 
 		public string GetPluginName()
 		{
-			return "CUETools DB Metadata Plugin V2.1.1";
+			return "CUETools DB Metadata Plugin V2.1.2";
 		}
 
 		public void ShowOptions()
diff --git a/CUETools.CTDB.EACPlugin/Options.Designer.cs b/CUETools.CTDB.EACPlugin/Options.Designer.cs
index b86e302..51ff251 100644
--- a/CUETools.CTDB.EACPlugin/Options.Designer.cs
+++ b/CUETools.CTDB.EACPlugin/Options.Designer.cs
@@ -39,15 +39,15 @@ namespace AudioDataPlugIn
 			// label1
 			// 
 			this.label1.AutoSize = true;
-			this.label1.Location = new System.Drawing.Point(147, 13);
+			this.label1.Location = new System.Drawing.Point(95, 13);
 			this.label1.Name = "label1";
 			this.label1.Size = new System.Drawing.Size(139, 13);
 			this.label1.TabIndex = 0;
-			this.label1.Text = "CUETools DB Plugin V2.1.1";
+			this.label1.Text = "CUETools DB Plugin V2.1.2";
 			// 
 			// label2
 			// 
-			this.label2.Location = new System.Drawing.Point(147, 67);
+			this.label2.Location = new System.Drawing.Point(95, 67);
 			this.label2.Name = "label2";
 			this.label2.Size = new System.Drawing.Size(230, 74);
 			this.label2.TabIndex = 1;
@@ -56,7 +56,7 @@ namespace AudioDataPlugIn
 			// linkLabel1
 			// 
 			this.linkLabel1.AutoSize = true;
-			this.linkLabel1.Location = new System.Drawing.Point(147, 36);
+			this.linkLabel1.Location = new System.Drawing.Point(95, 36);
 			this.linkLabel1.Name = "linkLabel1";
 			this.linkLabel1.Size = new System.Drawing.Size(164, 13);
 			this.linkLabel1.TabIndex = 3;
@@ -66,10 +66,10 @@ namespace AudioDataPlugIn
 			// 
 			// pictureBox1
 			// 
-			this.pictureBox1.Image = global::CUETools.CTDB.EACPlugin.Properties.Resources.ctdb1;
+			this.pictureBox1.Image = global::CUETools.CTDB.EACPlugin.Properties.Resources.ctdb64;
 			this.pictureBox1.Location = new System.Drawing.Point(13, 13);
 			this.pictureBox1.Name = "pictureBox1";
-			this.pictureBox1.Size = new System.Drawing.Size(128, 128);
+			this.pictureBox1.Size = new System.Drawing.Size(64, 64);
 			this.pictureBox1.TabIndex = 4;
 			this.pictureBox1.TabStop = false;
 			// 
@@ -77,7 +77,7 @@ namespace AudioDataPlugIn
 			// 
 			this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.ClientSize = new System.Drawing.Size(402, 158);
+			this.ClientSize = new System.Drawing.Size(332, 158);
 			this.Controls.Add(this.pictureBox1);
 			this.Controls.Add(this.linkLabel1);
 			this.Controls.Add(this.label2);
diff --git a/CUETools.CTDB.EACPlugin/Plugin.cs b/CUETools.CTDB.EACPlugin/Plugin.cs
index 993638a..c5061d1 100644
--- a/CUETools.CTDB.EACPlugin/Plugin.cs
+++ b/CUETools.CTDB.EACPlugin/Plugin.cs
@@ -10,6 +10,7 @@ using CUETools.CDImage;
 using CUETools.AccurateRip;
 using CUETools.Codecs;
 using CUETools.CTDB;
+using CUETools.CTDB.EACPlugin;
 
 namespace AudioDataPlugIn
 {
@@ -53,7 +54,7 @@ namespace AudioDataPlugIn
         // the plugin and for display in the log file
         public string GetAudioTransferPluginName()
         {
-            return "CUETools DB Plugin V2.1.1";
+            return "CUETools DB Plugin V2.1.2";
         }
 
         // Each plugin should have its own options page.
@@ -119,7 +120,9 @@ namespace AudioDataPlugIn
 #if USEAR
 			ar.ContactAccurateRip(ArId);
 #endif
-			ctdb.ContactDB("EAC" + m_data.HostVersion + " CTDB 2.1.1", m_drivename, false, false);
+			var form = new FormSubmitParity(ctdb, "EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename);
+			//ctdb.ContactDB("EAC" + m_data.HostVersion + " CTDB 2.1.2", m_drivename, false, false);
+			form.ShowDialog();
 			ctdb.Init(true, ar);
 			this.sequence_ok = true;
 			this.m_start_pos = 0;
@@ -205,8 +208,8 @@ namespace AudioDataPlugIn
 				return "";
 			if (this.sequence_ok)
 			{
-				ctdb.DoVerify();
-				ctdb.Submit(
+				var form = new FormSubmitParity(
+					ctdb,
 #if USEAR
 					(int)ar.WorstConfidence() + 1,
 #else
@@ -215,6 +218,7 @@ namespace AudioDataPlugIn
 					(arTest.Position == 0 && this.is_secure_mode) || arTest.CRC32(0) == ar.CRC32(0) ? 100 : 0,
 					m_data.AlbumArtist,
 					m_data.AlbumTitle);
+				form.ShowDialog();
 				sw.WriteLine("[CTDB TOCID: {0}] {1}{2}.", 
 					TOC.TOCID, 
 					ctdb.DBStatus ?? "found",
diff --git a/CUETools.CTDB.EACPlugin/Properties/Resources.Designer.cs b/CUETools.CTDB.EACPlugin/Properties/Resources.Designer.cs
index 2231d7f..2968130 100644
--- a/CUETools.CTDB.EACPlugin/Properties/Resources.Designer.cs
+++ b/CUETools.CTDB.EACPlugin/Properties/Resources.Designer.cs
@@ -67,9 +67,9 @@ namespace CUETools.CTDB.EACPlugin.Properties {
             }
         }
         
-        internal static System.Drawing.Bitmap ctdb1 {
+        internal static System.Drawing.Bitmap ctdb64 {
             get {
-                object obj = ResourceManager.GetObject("ctdb1", resourceCulture);
+                object obj = ResourceManager.GetObject("ctdb64", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
diff --git a/CUETools.CTDB.EACPlugin/Properties/Resources.resx b/CUETools.CTDB.EACPlugin/Properties/Resources.resx
index 0083e9f..6469b64 100644
--- a/CUETools.CTDB.EACPlugin/Properties/Resources.resx
+++ b/CUETools.CTDB.EACPlugin/Properties/Resources.resx
@@ -121,7 +121,7 @@
   <data name="ctdb" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\favicon.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="ctdb1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ctdb.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="ctdb64" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ctdb64.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
 </root>
\ No newline at end of file
diff --git a/CUETools.CTDB.EACPlugin/Resources/ctdb64.png b/CUETools.CTDB.EACPlugin/Resources/ctdb64.png
new file mode 100644
index 0000000..2f9f2d5
Binary files /dev/null and b/CUETools.CTDB.EACPlugin/Resources/ctdb64.png differ
diff --git a/CUETools.CTDB/CUEToolsDB.cs b/CUETools.CTDB/CUEToolsDB.cs
index 7909f02..d68b919 100644
--- a/CUETools.CTDB/CUEToolsDB.cs
+++ b/CUETools.CTDB/CUEToolsDB.cs
@@ -90,7 +90,7 @@ namespace CUETools.CTDB
 									uint.Parse(ctdbRespEntry.crc32, NumberStyles.HexNumber),
 									ctdbRespEntry.id,
 									entry_toc,
-									ctdbRespEntry.hasparity == 1);
+									ctdbRespEntry.hasparity);
 								entries.Add(entry);
 							}
 						if (ctdbResp.musicbrainz != null && ctdbResp.musicbrainz.Length != 0)
@@ -109,8 +109,9 @@ namespace CUETools.CTDB
 			}
 		}
 
-		public void FetchDB(string url, DBEntry entry)
+		public void FetchDB(DBEntry entry)
 		{
+			string url = entry.hasParity[0] == '/' ? urlbase + entry.hasParity : entry.hasParity;
 			HttpWebRequest req = (HttpWebRequest)WebRequest.Create(url);
 			req.Method = "GET";
 			req.Proxy = proxy;
@@ -346,11 +347,11 @@ namespace CUETools.CTDB
 					entry.canRecover = false;
 				else if (entry.hasErrors)
 				{
-					if (!entry.hasParity)
+					if (entry.hasParity == null || entry.hasParity == "")
 						entry.canRecover = false;
 					else
 					{
-						FetchDB(string.Format("{0}/repair.php?id={1}", urlbase, entry.id), entry);
+						FetchDB(entry);
 						if (entry.httpStatus != HttpStatusCode.OK)
 							entry.canRecover = false;
 						else
@@ -511,9 +512,9 @@ namespace CUETools.CTDB
 		public HttpStatusCode httpStatus;
 		public string id;
 		public CDImageLayout toc;
-		public bool hasParity;
+		public string hasParity;
 
-		public DBEntry(byte[] parity, int pos, int len, int conf, int npar, int stride, uint crc, string id, CDImageLayout toc, bool hasParity)
+		public DBEntry(byte[] parity, int pos, int len, int conf, int npar, int stride, uint crc, string id, CDImageLayout toc, string hasParity)
 		{
 			this.parity = parity;
 			this.id = id;
@@ -674,8 +675,8 @@ namespace CUETools.CTDB
 		public int npar { get; set; }
 		[XmlAttribute]
 		public int stride { get; set; }
-		[XmlAttribute, DefaultValue(1)]
-		public int hasparity { get; set; }
+		[XmlAttribute]
+		public string hasparity { get; set; }
 		[XmlAttribute]
 		public string parity { get; set; }
 		[XmlAttribute]
diff --git a/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs b/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs
index d1323c2..3179e63 100644
--- a/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs
+++ b/CUETools.Codecs.ALAC/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs b/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs
index cb10a0b..88da957 100644
--- a/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs
+++ b/CUETools.Codecs.FLACCL/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs b/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs
index 9b67c1d..1b3e5d4 100644
--- a/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs
+++ b/CUETools.Codecs.FLAKE/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs b/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs
index a577430..27a3765 100644
--- a/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs
+++ b/CUETools.Codecs.FlaCuda/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Codecs/Properties/AssemblyInfo.cs b/CUETools.Codecs/Properties/AssemblyInfo.cs
index f2ced86..6ae813f 100644
--- a/CUETools.Codecs/Properties/AssemblyInfo.cs
+++ b/CUETools.Codecs/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Compression.Rar/Properties/AssemblyInfo.cs b/CUETools.Compression.Rar/Properties/AssemblyInfo.cs
index fddd40f..26a06ff 100644
--- a/CUETools.Compression.Rar/Properties/AssemblyInfo.cs
+++ b/CUETools.Compression.Rar/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Compression.Zip/Properties/AssemblyInfo.cs b/CUETools.Compression.Zip/Properties/AssemblyInfo.cs
index eae5589..bd02e37 100644
--- a/CUETools.Compression.Zip/Properties/AssemblyInfo.cs
+++ b/CUETools.Compression.Zip/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Compression/Properties/AssemblyInfo.cs b/CUETools.Compression/Properties/AssemblyInfo.cs
index 5666bde..5d00c36 100644
--- a/CUETools.Compression/Properties/AssemblyInfo.cs
+++ b/CUETools.Compression/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs b/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs
index 3bef97e..6a61c0c 100644
--- a/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs
+++ b/CUETools.FLACCL.cmd/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs b/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs
index 0a5eaac..05eccc4 100644
--- a/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs
+++ b/CUETools.FlaCudaExe/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Parity/RsDecode.cs b/CUETools.Parity/RsDecode.cs
index 7499dd7..b055289 100644
Binary files a/CUETools.Parity/RsDecode.cs and b/CUETools.Parity/RsDecode.cs differ
diff --git a/CUETools.Processor/Processor.cs b/CUETools.Processor/Processor.cs
index d4f0f55..a1a7eed 100644
--- a/CUETools.Processor/Processor.cs
+++ b/CUETools.Processor/Processor.cs
@@ -4141,7 +4141,7 @@ string status = processor.Go();
 			}
 		}
 
-		public readonly static string CUEToolsVersion = "2.1.1";
+		public readonly static string CUEToolsVersion = "2.1.2";
 
 		public void GenerateAccurateRipLog(TextWriter sw)
 		{
diff --git a/CUETools.Processor/Properties/AssemblyInfo.cs b/CUETools.Processor/Properties/AssemblyInfo.cs
index 8791f5a..26436ab 100644
--- a/CUETools.Processor/Properties/AssemblyInfo.cs
+++ b/CUETools.Processor/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Ripper.Console/Program.cs b/CUETools.Ripper.Console/Program.cs
index d9ed370..deb8dde 100644
--- a/CUETools.Ripper.Console/Program.cs
+++ b/CUETools.Ripper.Console/Program.cs
@@ -89,7 +89,7 @@ namespace CUETools.ConsoleRipper
 		static void Main(string[] args)
 		{
 			Console.SetOut(Console.Error);
-			Console.WriteLine("CUERipper v2.1.1 Copyright (C) 2008-10 Gregory S. Chudov");
+			Console.WriteLine("CUERipper v2.1.2 Copyright (C) 2008-10 Gregory S. Chudov");
 			Console.WriteLine("This is free software under the GNU GPLv3+ license; There is NO WARRANTY, to");
 			Console.WriteLine("the extent permitted by law. <http://www.gnu.org/licenses/> for details.");
 
diff --git a/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs b/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs
index 5254ec6..d6bd2e9 100644
--- a/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs
+++ b/CUETools.Ripper.SCSI/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools.Ripper.SCSI/SCSIDrive.cs b/CUETools.Ripper.SCSI/SCSIDrive.cs
index 35dbfc3..16203a6 100644
--- a/CUETools.Ripper.SCSI/SCSIDrive.cs
+++ b/CUETools.Ripper.SCSI/SCSIDrive.cs
@@ -1187,7 +1187,7 @@ namespace CUETools.Ripper.SCSI
 		{
 			get
 			{
-				return "CUERipper v2.1.1 Copyright (C) 2008-10 Gregory S. Chudov";
+				return "CUERipper v2.1.2 Copyright (C) 2008-10 Gregory S. Chudov";
 				// ripper.GetName().Name + " " + ripper.GetName().Version;
 			}
 		}
diff --git a/CUETools.Ripper/Properties/AssemblyInfo.cs b/CUETools.Ripper/Properties/AssemblyInfo.cs
index 8f61584..9e3d01c 100644
--- a/CUETools.Ripper/Properties/AssemblyInfo.cs
+++ b/CUETools.Ripper/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers 
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools/CUETools1.vsmdi b/CUETools/CUETools1.vsmdi
index d3c80d5..659d726 100644
--- a/CUETools/CUETools1.vsmdi
+++ b/CUETools/CUETools1.vsmdi
@@ -3,4 +3,9 @@
   <TestList name="Lists of Tests" id="8c43106b-9dc1-4907-a29f-aa66a61bf5b6">
     <RunConfiguration id="cad9b348-419f-496e-92ed-2dfc5d74da06" name="Local Test Run" storage="localtestrun.testrunconfig" type="Microsoft.VisualStudio.TestTools.Common.TestRunConfiguration, Microsoft.VisualStudio.QualityTools.Common,   PublicKeyToken=b03f5f7f11d50a3a" />
   </TestList>
+  <TestList name="Results Not in a List" id="8c84fa94-04c1-424b-9868-57a2d4851a1d">
+    <TestLinks>
+      <TestLink id="06227a46-f5aa-99cb-8bbe-fc70e4892c9d" name="CTDBResponseTest" storage="bin\release\cuetools.testprocessor.dll" type="Microsoft.VisualStudio.TestTools.TestTypes.Unit.UnitTestElement, Microsoft.VisualStudio.QualityTools.Tips.UnitTest.ObjectModel,   PublicKeyToken=b03f5f7f11d50a3a" />
+    </TestLinks>
+  </TestList>
 </TestLists>
\ No newline at end of file
diff --git a/CUETools/Properties/AssemblyInfo.cs b/CUETools/Properties/AssemblyInfo.cs
index 314b552..9254268 100644
--- a/CUETools/Properties/AssemblyInfo.cs
+++ b/CUETools/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.1.1.0")]
-[assembly: AssemblyFileVersion("2.1.1.0")]
+[assembly: AssemblyVersion("2.1.2.0")]
+[assembly: AssemblyFileVersion("2.1.2.0")]
diff --git a/CUETools/frmCUETools.resx b/CUETools/frmCUETools.resx
index f193faa..8e5630d 100644
--- a/CUETools/frmCUETools.resx
+++ b/CUETools/frmCUETools.resx
@@ -256,7 +256,7 @@
     <value>fileSystemTreeView1</value>
   </data>
   <data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve">
-    <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve">
     <value>grpInput</value>
@@ -1204,7 +1204,7 @@
     <value>fileSystemTreeView1</value>
   </data>
   <data name="&gt;&gt;fileSystemTreeView1.Type" xml:space="preserve">
-    <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.1.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>CUEControls.FileSystemTreeView, CUEControls, Version=2.1.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;fileSystemTreeView1.Parent" xml:space="preserve">
     <value>grpInput</value>
@@ -3386,7 +3386,7 @@
     <value>700, 538</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>CUETools 2.1.1</value>
+    <value>CUETools 2.1.2</value>
   </data>
   <data name="&gt;&gt;toolStripStatusLabel1.Name" xml:space="preserve">
     <value>toolStripStatusLabel1</value>