UI revamp

2025-12-16 18:14:25 +00:00 · 2009-03-22 16:59:05 +00:00
parent 1e37155929
commit 3f8404fcaa
46 changed files with 5278 additions and 3120 deletions
--- a/ArCueDotNet/Program.cs
+++ b/ArCueDotNet/Program.cs
@@ -29,9 +29,10 @@ namespace ArCueDotNet
 			try
 			{
 				CUESheet cueSheet = new CUESheet(config);
+				cueSheet.Action = CUEAction.Verify;
 				cueSheet.Open(pathIn);
+				cueSheet.Lookup();
 				cueSheet.GenerateFilenames(OutputAudioFormat.NoAudio, false, pathIn);
-				cueSheet.AccurateRip = AccurateRipMode.Verify;
 				cueSheet.WriteAudioFiles(Path.GetDirectoryName(pathIn), CUEStyle.SingleFile);
 				cueSheet.GenerateAccurateRipLog(sw);
 			}
--- a/CUERipper/CUERipper.csproj
+++ b/CUERipper/CUERipper.csproj
@@ -156,6 +156,8 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="arok.ico" />
+    <None Include="Resources\accuraterip_16.bmp" />
+    <None Include="Resources\accuraterip.bmp" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/CUERipper/Properties/Resources.Designer.cs
+++ b/CUERipper/Properties/Resources.Designer.cs
@@ -60,6 +60,13 @@ namespace CUERipper.Properties {
            }
        }
        
+        internal static System.Drawing.Bitmap accuraterip16 {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        internal static System.Drawing.Bitmap arok {
            get {
                object obj = ResourceManager.GetObject("arok", resourceCulture);
--- a/CUERipper/Properties/Resources.resx
+++ b/CUERipper/Properties/Resources.resx
@@ -127,10 +127,10 @@
  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\arok.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
-  </data>
  <data name="arok" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\arok.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
+  <data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
--- a/CUERipper/arok.ico
+++ b/CUERipper/arok.ico
--- a/CUERipper/frmCUERipper.Designer.cs
+++ b/CUERipper/frmCUERipper.Designer.cs
@@ -33,10 +33,10 @@ namespace CUERipper
 			this.comboDrives = new System.Windows.Forms.ComboBox();
 			this.statusStrip1 = new System.Windows.Forms.StatusStrip();
 			this.toolStripStatusLabel1 = new System.Windows.Forms.ToolStripStatusLabel();
+			this.toolStripStatusAr = new System.Windows.Forms.ToolStripStatusLabel();
 			this.toolStripProgressBar1 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripProgressBar2 = new System.Windows.Forms.ToolStripProgressBar();
 			this.toolStripStatusLabel2 = new System.Windows.Forms.ToolStripStatusLabel();
-			this.toolStripStatusAr = new System.Windows.Forms.ToolStripStatusLabel();
 			this.listTracks = new System.Windows.Forms.ListView();
 			this.Title = new System.Windows.Forms.ColumnHeader();
 			this.TrackNo = new System.Windows.Forms.ColumnHeader();
@@ -72,12 +72,13 @@ namespace CUERipper
 			// 
 			this.statusStrip1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
            this.toolStripStatusLabel1,
+            this.toolStripStatusAr,
            this.toolStripProgressBar1,
            this.toolStripProgressBar2,
-            this.toolStripStatusLabel2,
-            this.toolStripStatusAr});
+            this.toolStripStatusLabel2});
 			resources.ApplyResources(this.statusStrip1, "statusStrip1");
 			this.statusStrip1.Name = "statusStrip1";
+			this.statusStrip1.ShowItemToolTips = true;
 			this.statusStrip1.SizingGrip = false;
 			// 
 			// toolStripStatusLabel1
@@ -86,6 +87,12 @@ namespace CUERipper
 			resources.ApplyResources(this.toolStripStatusLabel1, "toolStripStatusLabel1");
 			this.toolStripStatusLabel1.Spring = true;
 			// 
+			// toolStripStatusAr
+			// 
+			this.toolStripStatusAr.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+			resources.ApplyResources(this.toolStripStatusAr, "toolStripStatusAr");
+			this.toolStripStatusAr.Name = "toolStripStatusAr";
+			// 
 			// toolStripProgressBar1
 			// 
 			this.toolStripProgressBar1.AutoToolTip = true;
@@ -107,13 +114,6 @@ namespace CUERipper
 			this.toolStripStatusLabel2.Name = "toolStripStatusLabel2";
 			resources.ApplyResources(this.toolStripStatusLabel2, "toolStripStatusLabel2");
 			// 
-			// toolStripStatusAr
-			// 
-			this.toolStripStatusAr.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-			this.toolStripStatusAr.Image = global::CUERipper.Properties.Resources.arok;
-			this.toolStripStatusAr.Name = "toolStripStatusAr";
-			resources.ApplyResources(this.toolStripStatusAr, "toolStripStatusAr");
-			// 
 			// listTracks
 			// 
 			resources.ApplyResources(this.listTracks, "listTracks");
--- a/CUERipper/frmCUERipper.cs
+++ b/CUERipper/frmCUERipper.cs
@@ -353,8 +353,10 @@ namespace CUERipper
 			ReleaseInfo r = new ReleaseInfo();
 			r.cueSheet = new CUESheet(_config);
 			r.cueSheet.OpenCD(audioSource);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "GENRE", "", true);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "DATE", "", false);
 			General.SetCUELine(r.cueSheet.Attributes, "REM", "DISCID", AccurateRipVerify.CalculateCDDBId(audioSource.TOC), false);
-			General.SetCUELine(r.cueSheet.Attributes, "REM", "COMMENT", CDDriveReader.RipperVersion(), true);
+			General.SetCUELine(r.cueSheet.Attributes, "REM", "COMMENT", _config.createEACLOG ? "ExactAudioCopy v0.99pb4" : CDDriveReader.RipperVersion(), true);
 			if (release != null)
 			{
 				r.cueSheet.FillFromMusicBrainz(release);
@@ -372,7 +374,9 @@ namespace CUERipper
 				for (int i = 0; i < audioSource.TOC.AudioTracks; i++)
 					r.cueSheet.Tracks[i].Title = string.Format("Track {0:00}", i + 1);
 			}
-			r.cueSheet.AccurateRip = AccurateRipMode.VerifyAndConvert;
+			if (r.cueSheet.Genre == "") r.cueSheet.Genre = "";
+			if (r.cueSheet.Year == "") r.cueSheet.Year = "";
+			r.cueSheet.Action = CUEAction.VerifyAndConvert;
 			r.cueSheet.ArVerify.ContactAccurateRip(AccurateRipVerify.CalculateAccurateRipId(audioSource.TOC));
 			return r;
 		}
@@ -483,7 +487,10 @@ namespace CUERipper
 			{
 				SetupControls();
 				comboRelease.SelectedIndex = 0;
-				toolStripStatusAr.Visible = ((ReleaseInfo) comboRelease.SelectedItem).cueSheet.ArVerify.ARStatus == null;
+				CUESheet cueSheet = ((ReleaseInfo)comboRelease.SelectedItem).cueSheet;
+				toolStripStatusAr.Visible = true; //  cueSheet.ArVerify.ARStatus == null;
+				toolStripStatusAr.Text = cueSheet.ArVerify.ARStatus == null ? cueSheet.ArVerify.Total(0).ToString() : "?";
+				toolStripStatusAr.ToolTipText = "AccurateRip: " + (cueSheet.ArVerify.ARStatus ?? "found") + ".";
 			});
 		}

--- a/CUERipper/frmCUERipper.resx
+++ b/CUERipper/frmCUERipper.resx
@@ -148,11 +148,40 @@
    <value>0, 371</value>
  </metadata>
  <data name="toolStripStatusLabel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>254, 17</value>
+    <value>223, 17</value>
  </data>
  <data name="toolStripStatusLabel1.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
+  <data name="toolStripStatusAr.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
+  </data>
+  <data name="toolStripStatusAr.ImageTransparentColor" type="System.Drawing.Color, System.Drawing">
+    <value>White</value>
+  </data>
+  <data name="toolStripStatusAr.Size" type="System.Drawing.Size, System.Drawing">
+    <value>16, 17</value>
+  </data>
+  <data name="toolStripStatusAr.ToolTipText" xml:space="preserve">
+    <value>Album found in AccurateRip database.</value>
+  </data>
  <data name="toolStripProgressBar1.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 16</value>
  </data>
@@ -171,9 +200,6 @@
  <data name="toolStripStatusLabel2.Text" xml:space="preserve">
    <value>toolStripStatusAr</value>
  </data>
-  <data name="toolStripStatusAr.Size" type="System.Drawing.Size, System.Drawing">
-    <value>16, 17</value>
-  </data>
  <data name="statusStrip1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 371</value>
  </data>
@@ -541,6 +567,12 @@
  <data name="&gt;&gt;toolStripStatusLabel1.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;toolStripStatusAr.Name" xml:space="preserve">
+    <value>toolStripStatusAr</value>
+  </data>
+  <data name="&gt;&gt;toolStripStatusAr.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;toolStripProgressBar1.Name" xml:space="preserve">
    <value>toolStripProgressBar1</value>
  </data>
@@ -559,12 +591,6 @@
  <data name="&gt;&gt;toolStripStatusLabel2.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;toolStripStatusAr.Name" xml:space="preserve">
-    <value>toolStripStatusAr</value>
-  </data>
-  <data name="&gt;&gt;toolStripStatusAr.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ToolStripStatusLabel, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;Title.Name" xml:space="preserve">
    <value>Title</value>
  </data>
--- a/CUERipper/musicbrainz.ico
+++ b/CUERipper/musicbrainz.ico
--- a/CUETools.Codecs/Codecs.cs
+++ b/CUETools.Codecs/Codecs.cs
@@ -408,6 +408,8 @@ namespace CUETools.Codecs
 					_dataOffset = (ulong)pos;
 					if (!_IO.CanSeek || _IO.Length <= maxFileSize)
 					{
+						if (ckSize == 0x7fffffff)
+							throw new Exception("WAVE stream length unknown");
 						_dataLen = ckSize;
 					}
 					else
@@ -750,6 +752,8 @@ namespace CUETools.Codecs
 			try
 			{
 				started = _encoderProcess.Start();
+				if (started)
+					_encoderProcess.PriorityClass = Process.GetCurrentProcess().PriorityClass;
 			}
 			catch (Exception _ex)
 			{
@@ -837,6 +841,8 @@ namespace CUETools.Codecs
 			try
 			{
 				started = _decoderProcess.Start();
+				if (started)
+					_decoderProcess.PriorityClass = Process.GetCurrentProcess().PriorityClass;
 			}
 			catch (Exception _ex)
 			{
--- a/CUETools.Processor/Processor.cs
+++ b/CUETools.Processor/Processor.cs
@@ -57,13 +57,15 @@ namespace CUETools.Processor
 		UDC1
 	}

-	public enum AccurateRipMode
+	public enum CUEAction
 	{
-		None,
+		Convert,
 		Verify,
 		VerifyPlusCRCs,
 		VerifyThenConvert,
-		VerifyAndConvert
+		VerifyAndConvert,
+		CreateDummyCUE,
+		CorrectFilenames
 	}

 	public enum CUEStyle
@@ -144,8 +146,12 @@ namespace CUETools.Processor
 			}
 			else
 			{
-				line.Params[1] = value;
-				line.IsQuoted[1] = quoted;
+				while (line.Params.Count > 1)
+				{
+					line.Params.RemoveAt(1);
+					line.IsQuoted.RemoveAt(1);
+				}
+				line.Params.Add(value); line.IsQuoted.Add(quoted);
 			}
 		}

@@ -162,8 +168,12 @@ namespace CUETools.Processor
 			}
 			else
 			{
-				line.Params[2] = value;
-				line.IsQuoted[2] = quoted;
+				while (line.Params.Count > 2)
+				{
+					line.Params.RemoveAt(2);
+					line.IsQuoted.RemoveAt(2);
+				}
+				line.Params.Add(value); line.IsQuoted.Add(quoted);
 			}
 		}

@@ -277,6 +287,7 @@ namespace CUETools.Processor
 		public string udc1Extension, udc1Decoder, udc1Params, udc1Encoder, udc1EncParams;
 		public bool udc1APEv2, udc1ID3v2;
 		public bool disableAsm;
+		public bool oneInstance;

 		public CUEConfig()
 		{
@@ -329,6 +340,7 @@ namespace CUETools.Processor
 			udc1ID3v2 = udc1APEv2 = false;

 			disableAsm = false;
+			oneInstance = true;
 		}

 		public void Save (SettingsWriter sw)
@@ -378,6 +390,7 @@ namespace CUETools.Processor
 			sw.Save("DecodeHDCDToLossyWAV16", decodeHDCDtoLW16);
 			sw.Save("DecodeHDCDTo24bit", decodeHDCDto24bit);
 			sw.Save("DisableAsm", disableAsm);
+			sw.Save("OneInstance", oneInstance);
 			if (udc1Extension != "")
 			{
 				sw.Save("UDC1Extension", udc1Extension);
@@ -438,6 +451,7 @@ namespace CUETools.Processor
 			decodeHDCDto24bit = sr.LoadBoolean("DecodeHDCDTo24bit") ?? true;

 			disableAsm = sr.LoadBoolean("DisableAsm") ?? false;
+			oneInstance = sr.LoadBoolean("OneInstance") ?? true;

 			udc1Extension = sr.Load("UDC1Extension") ?? "";
 			udc1Decoder = sr.Load("UDC1Decoder") ?? "";
@@ -525,11 +539,9 @@ namespace CUETools.Processor
 		private bool _hasEmbeddedCUESheet;
 		private bool _paddedToFrame, _truncated4608, _usePregapForFirstTrackInSingleFile;
 		private int _writeOffset;
-		private AccurateRipMode _accurateRipMode;
-		private uint? _dataTrackLength;
+		private CUEAction _action;
 		private uint? _minDataTrackLength;
 		private string _accurateRipId;
-		private string _accurateRipIdActual;
 		private string _eacLog;
 		private string _cuePath;
 		private TagLib.File _fileInfo;
@@ -571,9 +583,8 @@ namespace CUETools.Processor
 			_paddedToFrame = false;
 			_truncated4608 = false;
 			_usePregapForFirstTrackInSingleFile = false;
-			_accurateRipMode = AccurateRipMode.None;
+			_action = CUEAction.Convert;
 			_appliedWriteOffset = false;
-			_dataTrackLength = null;
 			_minDataTrackLength = null;
 			hdcdDecoder = null;
 			_hasEmbeddedCUESheet = false;
@@ -590,7 +601,6 @@ namespace CUETools.Processor
 				_trackFilenames.Add(string.Format("{0:00}.wav", iTrack + 1));
 				_tracks.Add(new TrackInfo());
 			}
-			_accurateRipId = _accurateRipIdActual = AccurateRipVerify.CalculateAccurateRipId(_toc);
 			_arVerify = new AccurateRipVerify(_toc);
 			_isCD = true;
 			SourceInfo cdInfo;
@@ -833,16 +843,25 @@ namespace CUETools.Processor
 			if (cueDir == pathIn)
 			{
 				CDDriveReader ripper = new CDDriveReader();
-				ripper.Open(pathIn[0]);
-				if (ripper.TOC.AudioTracks > 0)
+				try
 				{
-					OpenCD(ripper);
-					int driveOffset;
-					if (!AccurateRipVerify.FindDriveReadOffset(_ripper.ARName, out driveOffset))
-						throw new Exception("Failed to find drive read offset for drive" + _ripper.ARName);
-					_ripper.DriveOffset = driveOffset;
-					LookupAlbumInfo();
-					return;
+					ripper.Open(pathIn[0]);
+					if (ripper.TOC.AudioTracks > 0)
+					{
+						OpenCD(ripper);
+						int driveOffset;
+						if (!AccurateRipVerify.FindDriveReadOffset(_ripper.ARName, out driveOffset))
+							throw new Exception("Failed to find drive read offset for drive" + _ripper.ARName);
+						_ripper.DriveOffset = driveOffset;
+						LookupAlbumInfo();
+						return;
+					}
+				}
+				catch
+				{
+					ripper.Dispose();
+					_ripper = null;
+					throw;
 				}
 			}
 #endif
@@ -977,8 +996,6 @@ namespace CUETools.Processor
 				_hasEmbeddedCUESheet = true;
 			}

-			string dataTrackLength = null;
-
 			using (sr) {
 				while ((lineStr = sr.ReadLine()) != null) {
 					line = new CUELine(lineStr);
@@ -1104,12 +1121,6 @@ namespace CUETools.Processor
 						{
 							// Remove ReplayGain lines
 						}
-						else if ((command == "REM") &&
-							(line.Params.Count == 3) &&
-							(line.Params[1].ToUpper() == "DATATRACKLENGTH"))
-						{
-							dataTrackLength = line.Params[2];
-						}
 						else if ((command == "REM") &&
 						   (line.Params.Count == 3) &&
 						   (line.Params[1].ToUpper() == "ACCURATERIPID"))
@@ -1168,6 +1179,7 @@ namespace CUETools.Processor
 			// Add dummy index 01 for data track
 			if (!_toc[_toc.TrackCount].IsAudio && indexes[indexes.Count - 1].Index == 0)
 			{
+				fileTimeLengthFrames += 152 * 75;
 				indexInfo.Track = trackNumber;
 				indexInfo.Index = 1;
 				indexInfo.Time = absoluteFileStartTime + fileTimeLengthFrames;
@@ -1197,7 +1209,12 @@ namespace CUETools.Processor
 			for (int iTrack = 1; iTrack <= _toc.TrackCount; iTrack++)
 			{
 				_toc[iTrack].Start = _toc[iTrack][1].Start;
-				_toc[iTrack].Length = (iTrack == _toc.TrackCount ? (uint)indexes[indexes.Count - 1].Time - _toc[iTrack].Start : _toc[iTrack + 1][1].Start - _toc[iTrack].Start);
+				_toc[iTrack].Length = iTrack == _toc.TrackCount
+					? (uint)indexes[indexes.Count - 1].Time - _toc[iTrack].Start
+					: _toc[iTrack + 1].IsAudio
+						? _toc[iTrack + 1][1].Start - _toc[iTrack].Start
+						: _toc[iTrack + 1][0].Start - _toc[iTrack].Start;
+
 			}

 			// Store the audio filenames, generating generic names if necessary
@@ -1272,67 +1289,35 @@ namespace CUETools.Processor

 			CDImageLayout tocFromLog = _eacLog == null ? null : TocFromLog(_eacLog);

+			// use pregap from log
 			if (tocFromLog != null && tocFromLog.Pregap > _toc.Pregap)
 				PreGapLength = tocFromLog.Pregap;

-			if (_accurateRipId == null)
+			// use data track length from log
+			if (tocFromLog != null && tocFromLog.AudioTracks == _toc.AudioTracks && tocFromLog.TrackCount == tocFromLog.AudioTracks + 1)
 			{
-				if (dataTrackLength != null)
-					DataTrackLength = dataTrackLength;
-				else
+				if (!tocFromLog[tocFromLog.TrackCount].IsAudio)
 				{
-					bool dtlFound = false;
-					if (tocFromLog != null)
-					{
-						// TODO: can just use smth like
-						// DataTrackLength = tocFromLog.DataTrackLengthMSF; 
-						// The only proplem is DataTrackLength property doesn't set last track's offset.
-
-						if (tocFromLog.TrackCount == _toc.TrackCount + 1 && !tocFromLog[tocFromLog.TrackCount].IsAudio)
-						{
-							//_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(tocFromLog);
-							_toc.AddTrack(new CDTrack((uint)tocFromLog.TrackCount, tocFromLog[tocFromLog.TrackCount].Start, tocFromLog[tocFromLog.TrackCount].Length, false, false));
-							dtlFound = true;
-						}
-						else if (tocFromLog.TrackCount == _toc.TrackCount)
-						{
-							if (!tocFromLog[1].IsAudio)
-							{
-								for (i = 2; i <= _toc.TrackCount; i++)
-								{
-									_toc[i].Start += tocFromLog[1].Length - _toc[1].Length;
-									for (int j = 0; j <= _toc[i].LastIndex; j++)
-										_toc[i][j].Start += tocFromLog[1].Length - _toc[1].Length;
-								}
-								_toc[1].Length = tocFromLog[1].Length;
-								dtlFound = true;
-							}
-							else if (!tocFromLog[tocFromLog.TrackCount].IsAudio)
-							{
-								_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
-								_toc[_toc.TrackCount].Length = tocFromLog[_toc.TrackCount].Length;
-								_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
-								_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
-								dtlFound = true;
-							}
-						}
-					}
-					if (!dtlFound && _cddbDiscIdTag != null)
-					{
-						uint cddbDiscIdNum;
-						if (uint.TryParse(_cddbDiscIdTag, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out cddbDiscIdNum) && (cddbDiscIdNum & 0xff) == _toc.TrackCount + 1)
-						{
-							uint lengthFromTag = ((cddbDiscIdNum >> 8) & 0xffff);
-							_minDataTrackLength = ((lengthFromTag + _toc[1].Start / 75) - 152) * 75 - _toc.Length;
-						}
-					}
-				}
+					DataTrackLength = tocFromLog[tocFromLog.TrackCount].Length;
+					_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
+				} else
+					DataTrackLength = tocFromLog[1].Length;
 			}

-			_accurateRipIdActual = AccurateRipVerify.CalculateAccurateRipId(_toc);
-
-			if (_accurateRipId == null)
-				_accurateRipId = _accurateRipIdActual;
+			// use data track length range from cddbId
+			if (DataTrackLength == 0 && _cddbDiscIdTag != null)
+			{
+				uint cddbDiscIdNum;
+				if (uint.TryParse(_cddbDiscIdTag, NumberStyles.HexNumber, CultureInfo.InvariantCulture, out cddbDiscIdNum) && (cddbDiscIdNum & 0xff) == _toc.AudioTracks + 1)
+				{
+					if (_toc.TrackCount == _toc.AudioTracks)
+						_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, 0, false, false));
+					uint lengthFromTag = ((cddbDiscIdNum >> 8) & 0xffff);
+					_minDataTrackLength = (lengthFromTag + _toc[1].Start / 75) * 75 - _toc.Length;
+				}
+			}

 			_arVerify = new AccurateRipVerify(_toc);

@@ -1370,18 +1355,43 @@ namespace CUETools.Processor
 						_arVerify.CRCLOG(1, 0);
 				}
 			}
+		}

-			//if (!_dataTrackLength.HasValue && _cddbDiscIdTag != null)
-			//{
-			//    uint cddbDiscIdNum = UInt32.Parse(_cddbDiscIdTag, NumberStyles.HexNumber);
-			//    if ((cddbDiscIdNum & 0xff) == TrackCount)
-			//    {
-			//        _cutOneFrame = true;
-			//        string cddbDiscIdTagCut = CalculateAccurateRipId().Split('-')[2];
-			//        if (cddbDiscIdTagCut.ToUpper() != _cddbDiscIdTag.ToUpper())
-			//            _cutOneFrame = false;
-			//    }
-			//}
+		public void Lookup()
+		{
+			if (_action == CUEAction.Verify 
+				|| _action == CUEAction.VerifyAndConvert 
+				|| _action == CUEAction.VerifyPlusCRCs 
+				|| _action == CUEAction.VerifyThenConvert
+				)
+			{
+				ShowProgress((string)"Contacting AccurateRip database...", 0, 0, null, null);
+				if (!_toc[_toc.TrackCount].IsAudio && DataTrackLength == 0 && _minDataTrackLength.HasValue && _accurateRipId == null && _config.bruteForceDTL)
+				{
+					uint minDTL = _minDataTrackLength.Value;
+					CDImageLayout toc2 = new CDImageLayout(_toc);
+					for (uint dtl = minDTL; dtl < minDTL + 75; dtl++)
+					{
+						toc2[toc2.TrackCount].Length = dtl;
+						_arVerify.ContactAccurateRip(AccurateRipVerify.CalculateAccurateRipId(toc2));
+						if (_arVerify.AccResult != HttpStatusCode.NotFound)
+						{
+							DataTrackLength = dtl;
+							break;
+						}
+						ShowProgress((string)"Contacting AccurateRip database...", 0, (dtl - minDTL) / 75.0, null, null);
+						CheckStop();
+						lock (this)
+						{
+							Monitor.Wait(this, 500);
+						}
+					}
+				}
+				else
+				{
+					_arVerify.ContactAccurateRip(_accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
+				}
+			}
 		}

 		public static Encoding Encoding {
@@ -1968,7 +1978,7 @@ namespace CUETools.Processor
 			for (int iTrack = 0; iTrack < _toc.AudioTracks; iTrack++)
 			{
 				int cdErrors = 0;
-				bool crcMismatch = _accurateRipMode == AccurateRipMode.VerifyThenConvert &&
+				bool crcMismatch = _action == CUEAction.VerifyThenConvert &&
 					_arVerify.BackupCRC(iTrack) != _arVerify.CRC(iTrack);
 				for (uint iSector = _toc[iTrack + 1].Start; iSector <= _toc[iTrack + 1].End; iSector++)
 					if (_ripper.Errors[(int)iSector])
@@ -1988,7 +1998,7 @@ namespace CUETools.Processor
 						logWriter.WriteLine("Track {0} contains {1} errors", iTrack + 1, cdErrors);
 				}
 			}
-			if (_accurateRipMode != AccurateRipMode.None)
+			if (_action != CUEAction.Convert)
 			{
 				logWriter.WriteLine();
 				logWriter.WriteLine("AccurateRip summary");
@@ -2034,7 +2044,7 @@ namespace CUETools.Processor
 			using (sw) 
 			{
 				if (_config.writeArTagsOnConvert)
-					WriteLine(sw, 0, "REM ACCURATERIPID " + _accurateRipId);
+					WriteLine(sw, 0, "REM ACCURATERIPID " + (_accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc)));

 				for (i = 0; i < _attributes.Count; i++)
 					WriteLine(sw, 0, _attributes[i]);
@@ -2091,24 +2101,24 @@ namespace CUETools.Processor
 		public void GenerateAccurateRipLog(TextWriter sw)
 		{
 			sw.WriteLine("[Verification date: {0}]", DateTime.Now);
-			sw.WriteLine("[Disc ID: {0}]", _accurateRipId);
+			sw.WriteLine("[Disc ID: {0}]", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			if (PreGapLength != 0)
 				sw.WriteLine("Pregap length {0}.", PreGapLengthMSF);
-			if (_dataTrackLength.HasValue)
-				sw.WriteLine("Assuming a data track was present, length {0}.", CDImageLayout.TimeToString(_dataTrackLength.Value));
-			else
-			{
-				if (_cddbDiscIdTag != null && _accurateRipId.Split('-')[2].ToUpper() != _cddbDiscIdTag.ToUpper())
-					sw.WriteLine("CDDBId mismatch: {0} vs {1}", _cddbDiscIdTag.ToUpper(), _accurateRipId.Split('-')[2].ToUpper());
-				if (_minDataTrackLength.HasValue)
-					sw.WriteLine("Data track was probably present, length {0}-{1}.", CDImageLayout.TimeToString(_minDataTrackLength.Value), CDImageLayout.TimeToString(_minDataTrackLength.Value + 74));
-				if (_accurateRipIdActual != _accurateRipId)
-					sw.WriteLine("Using preserved id, actual id is {0}.", _accurateRipIdActual);
-				if (_truncated4608)
-					sw.WriteLine("Truncated 4608 extra samples in some input files.");
-				if (_paddedToFrame)
-					sw.WriteLine("Padded some input files to a frame boundary.");
-			}
+			if (!_toc[1].IsAudio)
+				sw.WriteLine("Playstation type data track length {0}.", _toc[1].LengthMSF);
+			if (!_toc[_toc.TrackCount].IsAudio)
+				sw.WriteLine("CD-Extra data track length {0}.", 
+					_toc[_toc.TrackCount].Length == 0 && _minDataTrackLength.HasValue ? 
+						CDImageLayout.TimeToString(_minDataTrackLength.Value) + " - " + CDImageLayout.TimeToString(_minDataTrackLength.Value + 74) : 
+						_toc[_toc.TrackCount].LengthMSF );
+			if (_cddbDiscIdTag != null && AccurateRipVerify.CalculateCDDBId(_toc).ToUpper() != _cddbDiscIdTag.ToUpper() && !_minDataTrackLength.HasValue)
+				sw.WriteLine("CDDBId mismatch: {0} vs {1}", _cddbDiscIdTag.ToUpper(), AccurateRipVerify.CalculateCDDBId(_toc).ToUpper());
+			if (_accurateRipId != null && AccurateRipVerify.CalculateAccurateRipId(_toc) != _accurateRipId)
+				sw.WriteLine("Using preserved id, actual id is {0}.", AccurateRipVerify.CalculateAccurateRipId(_toc));
+			if (_truncated4608)
+				sw.WriteLine("Truncated 4608 extra samples in some input files.");
+			if (_paddedToFrame)
+				sw.WriteLine("Padded some input files to a frame boundary.");

 			if (hdcdDecoder != null && hdcdDecoder.Detected)
 			{
@@ -2149,7 +2159,7 @@ namespace CUETools.Processor
 						matching3 += _arVerify.AccDisks[iDisk].tracks[iTrack].count;
 			}
 			tags.Add(String.Format("{0}ACCURATERIPCRC", prefix), String.Format("{0:x8}", _arVerify.CRC(iTrack, offset)));
-			tags.Add(String.Format("{0}AccurateRipDiscId", prefix), String.Format("{0:000}-{1}-{2:00}", TrackCount, _accurateRipId, iTrack+1));
+			tags.Add(String.Format("{0}AccurateRipDiscId", prefix), String.Format("{0:000}-{1}-{2:00}", TrackCount, _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc), iTrack + 1));
 			tags.Add(String.Format("{0}ACCURATERIPCOUNT", prefix), String.Format("{0}", matching));
 			tags.Add(String.Format("{0}ACCURATERIPCOUNTALLOFFSETS", prefix), String.Format("{0}", matching3));
 			tags.Add(String.Format("{0}ACCURATERIPTOTAL", prefix), String.Format("{0}", total));
@@ -2159,7 +2169,7 @@ namespace CUETools.Processor

 		public void GenerateAccurateRipTags(NameValueCollection tags, int offset, int bestOffset, int iTrack)
 		{
-			tags.Add("ACCURATERIPID", _accurateRipId);
+			tags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			if (bestOffset != offset)
 				tags.Add("ACCURATERIPOFFSET", String.Format("{1}{0}", bestOffset - offset, bestOffset > offset ? "+" : ""));
 			if (iTrack != -1)
@@ -2220,13 +2230,13 @@ namespace CUETools.Processor
 			outTracksMatch = bestTracksMatch;
 		}

-		public void WriteAudioFiles(string dir, CUEStyle style) {
+		public string WriteAudioFiles(string dir, CUEStyle style) {
 			string[] destPaths;
 			int[] destLengths;
 			bool htoaToFile = ((style == CUEStyle.GapsAppended) && _config.preserveHTOA &&
 				(_toc.Pregap != 0));

-			if (_isCD && (style == CUEStyle.GapsLeftOut || style == CUEStyle.GapsPrepended) && (_accurateRipMode == AccurateRipMode.None || _accurateRipMode == AccurateRipMode.VerifyAndConvert))
+			if (_isCD && (style == CUEStyle.GapsLeftOut || style == CUEStyle.GapsPrepended) && (_action == CUEAction.Convert || _action == CUEAction.VerifyAndConvert))
 				throw new Exception("When ripping a CD, gaps Left Out/Gaps prepended modes can only be used in verify-then-convert mode");

 			if (_usePregapForFirstTrackInSingleFile)
@@ -2246,7 +2256,7 @@ namespace CUETools.Processor
 				}
 			}

-			if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+			if (_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs)
 				for (int i = 0; i < destPaths.Length; i++)
 					for (int j = 0; j < _sourcePaths.Count; j++)
 						if (destPaths[i].ToLower() == _sourcePaths[j].ToLower())
@@ -2256,64 +2266,32 @@ namespace CUETools.Processor

 			bool SkipOutput = false;

-			if (_accurateRipMode != AccurateRipMode.None)
-			{
-				ShowProgress((string)"Contacting AccurateRip database...", 0, 0, null, null);
-				if (!_dataTrackLength.HasValue && _minDataTrackLength.HasValue && _accurateRipId == _accurateRipIdActual && _config.bruteForceDTL)
-				{
-					uint minDTL = _minDataTrackLength.Value;
-					CDImageLayout toc2 = new CDImageLayout(_toc);
-					toc2.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152 * 75, minDTL, false, false));
-					for (uint dtl = minDTL; dtl < minDTL + 75; dtl++)
-					{
-						toc2[toc2.TrackCount].Length = dtl;
-						_accurateRipId = AccurateRipVerify.CalculateAccurateRipId(toc2);
-						_arVerify.ContactAccurateRip(_accurateRipId);
-						if (_arVerify.AccResult != HttpStatusCode.NotFound)
-						{
-							_dataTrackLength = dtl;
-							break;
-						}
-						ShowProgress((string)"Contacting AccurateRip database...", 0, (dtl - minDTL) / 75.0, null, null);
-						CheckStop();
-						lock (this)
-						{
-							Monitor.Wait(this, 1000);
-						}
-					}
-					if (_arVerify.AccResult != HttpStatusCode.OK)
-					{
-						_accurateRipId = _accurateRipIdActual;
-					}
-				}
-				else
-				{
-					//CDImageLayout toc2 = new CDImageLayout(_toc);
-					//bool found = false;
-					//for (uint len = 0; len < 150; len++)
-					//{
-					//    toc2[toc2.TrackCount].Length = _toc[_toc.TrackCount].Length + len;
-					//    string id = AccurateRipVerify.CalculateAccurateRipId(toc2);
-					//    _arVerify.ContactAccurateRip(id);
-					//    if (_arVerify.AccResult != HttpStatusCode.NotFound)
-					//    {
-					//        _accurateRipId = id;
-					//        found = true;
-					//        break;
-					//    }
-					//    ShowProgress((string)"Contacting AccurateRip database...", 0, len / 150.0, null, null);
-					//    CheckStop();
-					//    lock (this) { Monitor.Wait(this, 1000); }
-					//}
-					//if (!found)
-					_arVerify.ContactAccurateRip(_accurateRipId);
-				}
+			// Lookup();

-				if (_accurateRipMode == AccurateRipMode.Verify)
+			if (_action == CUEAction.Verify)
+			{
+				if (_arVerify.AccResult != HttpStatusCode.OK)
 				{
-					if (_arVerify.AccResult != HttpStatusCode.OK)
+					if (_config.writeArLogOnVerify)
 					{
-						if (_config.writeArLogOnVerify)
+						if (!Directory.Exists(dir))
+							Directory.CreateDirectory(dir);
+						StreamWriter sw = new StreamWriter(Path.ChangeExtension(_cuePath, ".accurip"),
+							false, CUESheet.Encoding);
+						GenerateAccurateRipLog(sw);
+						sw.Close();
+					}
+					return _arVerify.ARStatus;
+				}
+			}
+
+			if (_action == CUEAction.VerifyThenConvert)
+			{
+				if (_arVerify.AccResult != HttpStatusCode.OK && !_isCD)
+				{
+					if (_config.noUnverifiedOutput)
+					{
+						if (_config.writeArLogOnConvert)
 						{
 							if (!Directory.Exists(dir))
 								Directory.CreateDirectory(dir);
@@ -2322,87 +2300,74 @@ namespace CUETools.Processor
 							GenerateAccurateRipLog(sw);
 							sw.Close();
 						}
-						return;
+						if (_config.createTOC)
+						{
+							if (!Directory.Exists(dir))
+								Directory.CreateDirectory(dir);
+							WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
+						}
+						return _arVerify.ARStatus;
 					}
 				}
-
-				if (_accurateRipMode == AccurateRipMode.VerifyThenConvert)
+				else
 				{
-					if (_arVerify.AccResult != HttpStatusCode.OK && !_isCD)
+					_writeOffset = 0;
+					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, true);
+					if (!_isCD)
 					{
+						uint tracksMatch;
+						int bestOffset;
+
 						if (_config.noUnverifiedOutput)
 						{
-							if (_config.writeArLogOnConvert)
-							{
-								if (!Directory.Exists(dir))
-									Directory.CreateDirectory(dir);
-								StreamWriter sw = new StreamWriter(Path.ChangeExtension(_cuePath, ".accurip"),
-									false, CUESheet.Encoding);
-								GenerateAccurateRipLog(sw);
-								sw.Close();
-							}
-							if (_config.createTOC)
-							{
-								if (!Directory.Exists(dir))
-									Directory.CreateDirectory(dir);
-								WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
-							}
-							return;
+							FindBestOffset(_config.encodeWhenConfidence, false, out tracksMatch, out bestOffset);
+							if (tracksMatch * 100 < _config.encodeWhenPercent * TrackCount || (_config.encodeWhenZeroOffset && bestOffset != 0))
+								SkipOutput = true;
 						}
-					}
-					else
-					{
-						_writeOffset = 0;
-						WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, true);
-						if (!_isCD)
+
+						if (!SkipOutput && _config.fixOffset)
 						{
-							uint tracksMatch;
-							int bestOffset;
-
-							if (_config.noUnverifiedOutput)
-							{
-								FindBestOffset(_config.encodeWhenConfidence, false, out tracksMatch, out bestOffset);
-								if (tracksMatch * 100 < _config.encodeWhenPercent * TrackCount || (_config.encodeWhenZeroOffset && bestOffset != 0))
-									SkipOutput = true;
-							}
-
-							if (!SkipOutput && _config.fixOffset)
-							{
-								FindBestOffset(_config.fixWhenConfidence, false, out tracksMatch, out bestOffset);
-								if (tracksMatch * 100 >= _config.fixWhenPercent * TrackCount)
-									_writeOffset = bestOffset;
-							}
+							FindBestOffset(_config.fixWhenConfidence, false, out tracksMatch, out bestOffset);
+							if (tracksMatch * 100 >= _config.fixWhenPercent * TrackCount)
+								_writeOffset = bestOffset;
 						}
-						_arVerify.CreateBackup(_writeOffset);
 					}
+					_arVerify.CreateBackup(_writeOffset);
 				}
 			}

 			if (!SkipOutput)
 			{
-				if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+				if (_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs)
 				{
 					if (!Directory.Exists(dir))
 						Directory.CreateDirectory(dir);
 				}
 				if (_isCD)
 					destLengths = CalculateAudioFileLengths(style); // need to recalc, might have changed after scanning the CD
-				if (_outputFormat != OutputAudioFormat.NoAudio || _accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs)
-					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, _accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs);
+				if (_outputFormat != OutputAudioFormat.NoAudio || _action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs)
+					WriteAudioFilesPass(dir, style, destPaths, destLengths, htoaToFile, _action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs);
 				CreateRipperLOG(destPaths, style);
-				if (_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs)
+				if (_action == CUEAction.Convert || _action == CUEAction.VerifyAndConvert || _action == CUEAction.VerifyThenConvert)
 				{
 					string cueContents = CUESheetContents(style);
 					uint tracksMatch = 0;
 					int bestOffset = 0;
 					
-					if (_accurateRipMode != AccurateRipMode.None &&
+					if (_action != CUEAction.Convert &&
 						_config.writeArTagsOnConvert &&
 						_arVerify.AccResult == HttpStatusCode.OK)
 						FindBestOffset(1, true, out tracksMatch, out bestOffset);

+					if (_config.createEACLOG)
+					{
+						if (_ripperLog != null)
+							_ripperLog = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(_ripperLog));
+						cueContents = CUESheet.Encoding.GetString(CUESheet.Encoding.GetBytes(cueContents));
+					}
+
 					if (_ripperLog != null)
-						WriteText(Path.ChangeExtension(_cuePath, ".log"), _ripperLog, _config.createEACLOG ? CUESheet.Encoding : Encoding.UTF8);
+						WriteText(Path.ChangeExtension(_cuePath, ".log"), _ripperLog);
 					else
 						if (_eacLog != null && _config.extractLog)
 							WriteText(Path.ChangeExtension(_cuePath, ".log"), _eacLog);
@@ -2486,12 +2451,12 @@ namespace CUETools.Processor
 				}
 			}

-			if (_accurateRipMode == AccurateRipMode.Verify ||
-				_accurateRipMode == AccurateRipMode.VerifyPlusCRCs ||
-				(_accurateRipMode != AccurateRipMode.None && _outputFormat != OutputAudioFormat.NoAudio))
+			if (_action == CUEAction.Verify ||
+				_action == CUEAction.VerifyPlusCRCs ||
+				(_action != CUEAction.Convert && _outputFormat != OutputAudioFormat.NoAudio))
 			{
 				ShowProgress((string)"Generating AccurateRip report...", 0, 0, null, null);
-				if ((_accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs) && _config.writeArTagsOnVerify && _writeOffset == 0 && !_isArchive && !_isCD)
+				if ((_action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs) && _config.writeArTagsOnVerify && _writeOffset == 0 && !_isArchive && !_isCD)
 				{
 					uint tracksMatch;
 					int bestOffset;
@@ -2521,8 +2486,8 @@ namespace CUETools.Processor
 					}
 				}

-				if ((_accurateRipMode != AccurateRipMode.Verify && _accurateRipMode != AccurateRipMode.VerifyPlusCRCs && _config.writeArLogOnConvert) ||
-					((_accurateRipMode == AccurateRipMode.Verify || _accurateRipMode == AccurateRipMode.VerifyPlusCRCs) && _config.writeArLogOnVerify))
+				if ((_action != CUEAction.Verify && _action != CUEAction.VerifyPlusCRCs && _config.writeArLogOnConvert) ||
+					((_action == CUEAction.Verify || _action == CUEAction.VerifyPlusCRCs) && _config.writeArLogOnVerify))
 				{
 					if (!Directory.Exists(dir))
 						Directory.CreateDirectory(dir);
@@ -2538,6 +2503,7 @@ namespace CUETools.Processor
 					WriteText(Path.ChangeExtension(_cuePath, ".toc"), TOCContents());
 				}
 			}
+			return "done";
 		}

 		private NameValueCollection GenerateTrackTags(int iTrack, int bestOffset)
@@ -2593,10 +2559,10 @@ namespace CUETools.Processor

 			if (_config.writeArTagsOnConvert)
 			{
-				if (_accurateRipMode != AccurateRipMode.None && _arVerify.AccResult == HttpStatusCode.OK)
+				if (_action != CUEAction.Convert && _arVerify.AccResult == HttpStatusCode.OK)
 					GenerateAccurateRipTags(destTags, _writeOffset, bestOffset, iTrack);
 				else
-					destTags.Add("ACCURATERIPID", _accurateRipId);
+					destTags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			}
 			return destTags;
 		}
@@ -2667,10 +2633,10 @@ namespace CUETools.Processor

 			if (_config.writeArTagsOnConvert)
 			{
-				if (fWithCUE && _accurateRipMode != AccurateRipMode.None && _arVerify.AccResult == HttpStatusCode.OK)
+				if (fWithCUE && _action != CUEAction.Convert && _arVerify.AccResult == HttpStatusCode.OK)
 					GenerateAccurateRipTags(destTags, _writeOffset, bestOffset, -1);
 				else
-					destTags.Add("ACCURATERIPID", _accurateRipId);
+					destTags.Add("ACCURATERIPID", _accurateRipId ?? AccurateRipVerify.CalculateAccurateRipId(_toc));
 			}
 			return destTags;
 		}
@@ -2748,7 +2714,7 @@ namespace CUETools.Processor
 			uint diskLength = 588 * _toc.AudioLength;
 			uint diskOffset = 0;

-			if (_accurateRipMode != AccurateRipMode.None)
+			if (_action != CUEAction.Convert)
 				_arVerify.Init();

 			ShowProgress(String.Format("{2} track {0:00} ({1:00}%)...", 0, 0, noOutput ? "Verifying" : "Writing"), 0, 0.0, null, null);
@@ -2861,7 +2827,7 @@ namespace CUETools.Processor
 									}
 								}
 							}
-							if (_accurateRipMode != AccurateRipMode.None)
+							if (_action != CUEAction.Convert)
 								_arVerify.Write(sampleBuffer, copyCount);
 							if (iTrack > 0 || iIndex > 0)
 								Tracks[iTrack + (iIndex == 0 ? -1 : 0)].MeasurePeakLevel(sampleBuffer, copyCount);
@@ -2905,7 +2871,7 @@ namespace CUETools.Processor
 					if (_toc[_toc.FirstAudio + iTrack].ISRC != null)
 						General.SetCUELine(_tracks[iTrack].Attributes, "ISRC", _toc[_toc.FirstAudio + iTrack].ISRC, false);
 					if (_toc[_toc.FirstAudio + iTrack].DCP || _toc[_toc.FirstAudio + iTrack].PreEmphasis)
-						General.SetCUELine(_tracks[iTrack].Attributes, "FLAGS", (_toc[_toc.FirstAudio + iTrack].PreEmphasis ? " PRE" : "") + (_toc[_toc.FirstAudio + iTrack].DCP ? " DCP" : ""), false);
+						_tracks[iTrack].Attributes.Add(new CUELine("FLAGS" + (_toc[_toc.FirstAudio + iTrack].PreEmphasis ? " PRE" : "") + (_toc[_toc.FirstAudio + iTrack].DCP ? " DCP" : "")));
 				}
 			}
 #endif
@@ -2946,7 +2912,7 @@ namespace CUETools.Processor

 		public static string CorrectAudioFilenames(string dir, string cue, bool always, List<string> files) 
 		{
-			string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta" };
+			string[] audioExts = new string[] { "*.wav", "*.flac", "*.wv", "*.ape", "*.m4a", "*.tta", "*.tak", "*.ogg" };
 			List<string> lines = new List<string>();
 			List<int> filePos = new List<int>();
 			List<string> origFiles = new List<string>();
@@ -3012,7 +2978,7 @@ namespace CUETools.Processor
 					}
 				}
 				if (!foundAll)
-					throw new Exception("Unable to locate the audio files.");
+					throw new Exception("unable to locate the audio files");

 				for (i = 0; i < filePos.Count; i++)
 					lines[filePos[i]] = "FILE \"" + Path.GetFileName(audioFiles[i]) + "\" WAVE";
@@ -3067,7 +3033,7 @@ namespace CUETools.Processor
 			return fileLengths;
 		}

-		private void CheckStop()
+		public void CheckStop()
 		{
 			lock (this)
 			{
@@ -3305,39 +3271,52 @@ namespace CUETools.Processor
 			}
 		}

-		public string DataTrackLength
+		public uint DataTrackLength
 		{
 			get
 			{
-				return CDImageLayout.TimeToString(_dataTrackLength.HasValue ? _dataTrackLength.Value : 0);
+				if (!_toc[1].IsAudio)
+					return _toc[1].Length;
+				else if (!_toc[_toc.TrackCount].IsAudio)
+					return _toc[_toc.TrackCount].Length;
+				else
+					return 0U;
 			}
 			set
 			{
-				uint dtl = (uint)CDImageLayout.TimeFromString(value);
-				if (dtl != 0)
+				if (value == 0)
+					return;
+				if (!_toc[1].IsAudio)
 				{
-					if (!_toc[1].IsAudio)
+					for (int i = 2; i <= _toc.TrackCount; i++)
 					{
-						for (int i = 2; i <= _toc.TrackCount; i++)
-						{
-							_toc[i].Start += dtl - _toc[1].Length;
-							for (int j = 0; j <= _toc[i].LastIndex; j++)
-								_toc[i][j].Start += dtl - _toc[1].Length;
-						}
-						_toc[1].Length = dtl;
+						_toc[i].Start += value - _toc[1].Length;
+						for (int j = 0; j <= _toc[i].LastIndex; j++)
+							_toc[i][j].Start += value - _toc[1].Length;
 					}
-					else if (!_toc[_toc.TrackCount].IsAudio)
-					{
-						//_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
-						_toc[_toc.TrackCount].Length = dtl;
-						//_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
-						//_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
-					}
-					else
-						_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152U * 75U, dtl, false, false));
-					_dataTrackLength = dtl;
-					_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(_toc);
+					_toc[1].Length = value;
 				}
+				else if (!_toc[_toc.TrackCount].IsAudio)
+				{
+					//_toc[_toc.TrackCount].Start = tocFromLog[_toc.TrackCount].Start;
+					_toc[_toc.TrackCount].Length = value;
+					//_toc[_toc.TrackCount][0].Start = tocFromLog[_toc.TrackCount].Start;
+					//_toc[_toc.TrackCount][1].Start = tocFromLog[_toc.TrackCount].Start;
+				}
+				else
+					_toc.AddTrack(new CDTrack((uint)_toc.TrackCount, _toc.Length + 152U * 75U, value, false, false));
+			}
+		}
+
+		public string DataTrackLengthMSF
+		{
+			get
+			{
+				return CDImageLayout.TimeToString(DataTrackLength);
+			}
+			set
+			{
+				DataTrackLength = (uint) CDImageLayout.TimeFromString(value);
 			}
 		}

@@ -3381,8 +3360,6 @@ namespace CUETools.Processor
 				sourceInfo.Offset = 0;
 				sourceInfo.Length = offs * 588;
 				_sources.Insert(0, sourceInfo);
-
-				_accurateRipIdActual = _accurateRipId = AccurateRipVerify.CalculateAccurateRipId(_toc);
 			}
 		}

@@ -3403,15 +3380,15 @@ namespace CUETools.Processor
 			}
 		}

-		public AccurateRipMode AccurateRip
+		public CUEAction Action
 		{
 			get
 			{
-				return _accurateRipMode;
+				return _action;
 			}
 			set
 			{
-				_accurateRipMode = value;
+				_action = value;
 			}
 		}

--- a/CUETools.Processor/UserDefined.cs
+++ b/CUETools.Processor/UserDefined.cs
@@ -329,7 +329,7 @@ namespace TagLib.UserDefined {

 		private static TagLib.File UserDefinedResolver(TagLib.File.IFileAbstraction abstraction, string mimetype, TagLib.ReadStyle style)
 		{
-			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav" || mimetype == "taglib/ogg" || mimetype == "taglib/m4a")
+			if (mimetype == "taglib/flac" || mimetype == "taglib/wv" || mimetype == "taglib/ape" || mimetype == "taglib/wav" || mimetype == "taglib/ogg" || mimetype == "taglib/m4a" || mimetype == "taglib/mp3")
 				return null;
 			if (mimetype == "taglib/tta")
 				return new File(abstraction, style, true, false);
--- a/CUETools.Ripper.SCSI/SCSIDrive.cs
+++ b/CUETools.Ripper.SCSI/SCSIDrive.cs
@@ -36,7 +36,7 @@ namespace CUETools.Ripper.SCSI
 	/// <summary>
 	/// 
 	/// </summary>
-	public class CDDriveReader : IAudioSource
+	public class CDDriveReader : IAudioSource, IDisposable
 	{
 		byte[] cdtext = null;
 		private Device m_device;
@@ -277,11 +277,17 @@ namespace CUETools.Ripper.SCSI

 		public void Close()
 		{
-			m_device.Close();
+			if (m_device != null)
+				m_device.Close();
 			m_device = null;
 			_toc = null;
 		}

+		public void Dispose()
+		{
+			Close();
+		}
+
 		public int BestBlockSize
 		{
 			get
--- a/CUETools/CUETools.csproj
+++ b/CUETools/CUETools.csproj
@@ -71,10 +71,15 @@
    <ErrorReport>prompt</ErrorReport>
  </PropertyGroup>
  <ItemGroup>
+    <Reference Include="ICSharpCode.SharpZipLib, Version=0.85.5.452, Culture=neutral, PublicKeyToken=1b03e6acf1164f73, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\CUETools.Processor\ICSharpCode.SharpZipLib.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.Deployment" />
    <Reference Include="System.Drawing" />
+    <Reference Include="System.Runtime.Remoting" />
    <Reference Include="System.Windows.Forms" />
    <Reference Include="System.Xml" />
  </ItemGroup>
@@ -224,10 +229,26 @@
    <Compile Include="Settings.cs" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\..\taglib-sharp\taglib-sharp.csproj">
+      <Project>{4CC18776-125E-4318-9D24-D60110AD9697}</Project>
+      <Name>taglib-sharp</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CUEControls\CUEControls.csproj">
+      <Project>{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}</Project>
+      <Name>CUEControls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\CUETools.AccurateRip\CUETools.AccurateRip.csproj">
+      <Project>{5802C7E9-157E-4124-946D-70B5AE48A5A1}</Project>
+      <Name>CUETools.AccurateRip</Name>
+    </ProjectReference>
    <ProjectReference Include="..\CUETools.CDImage\CUETools.CDImage.csproj">
      <Project>{1DD41038-D885-46C5-8DDE-E0B82F066584}</Project>
      <Name>CUETools.CDImage</Name>
    </ProjectReference>
+    <ProjectReference Include="..\CUETools.Codecs\CUETools.Codecs.csproj">
+      <Project>{6458A13A-30EF-45A9-9D58-E5031B17BEE2}</Project>
+      <Name>CUETools.Codecs</Name>
+    </ProjectReference>
    <ProjectReference Include="..\CUETools.Processor\CUETools.Processor.csproj">
      <Project>{4911BD82-49EF-4858-8B51-5394F86739A4}</Project>
      <Name>CUETools.Processor</Name>
@@ -248,9 +269,15 @@
    <None Include="Resources\musicbrainz.ico" />
  </ItemGroup>
  <ItemGroup>
+    <None Include="Resources\accuraterip.jpg" />
+    <Content Include="Resources\accuraterip_16.bmp" />
+    <Content Include="Resources\AR.ico" />
    <Content Include="Resources\cue.ico" />
    <Content Include="Resources\cue_32.ico" />
    <Content Include="Resources\eac.ico" />
+    <Content Include="Resources\flac.ico" />
+    <Content Include="Resources\icon-wv.png" />
+    <Content Include="Resources\wav.bmp" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/CUETools/CUETools.sln
+++ b/CUETools/CUETools.sln
@@ -85,6 +85,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUETools.Converter", "..\CU
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "taglib-sharp", "..\..\taglib-sharp\taglib-sharp.csproj", "{4CC18776-125E-4318-9D24-D60110AD9697}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CUEControls", "..\CUEControls\CUEControls.csproj", "{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -542,6 +544,22 @@ Global
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x64.Build.0 = Release|Any CPU
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x86.ActiveCfg = Release|Any CPU
 		{4CC18776-125E-4318-9D24-D60110AD9697}.Release|x86.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x64.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Debug|x86.Build.0 = Debug|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x64.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x64.Build.0 = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x86.ActiveCfg = Release|Any CPU
+		{CA4D64E6-6544-4A29-8BA5-7DB08D50D072}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
--- a/CUETools/Program.cs
+++ b/CUETools/Program.cs
@@ -4,22 +4,25 @@ using System.Windows.Forms;
 using System.IO;
 using System.Text;
 using CUETools.Processor;
+using System.Threading;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Channels.Ipc;

 namespace JDP {
 	static class Program {
 		[STAThread]
 		static void Main(string[] args)
 		{
-			Application.EnableVisualStyles();
-			Application.SetCompatibleTextRenderingDefault(false);
 			if (args.Length > 1 && (args[0] == "/verify" || args[0] == "/crc" || args[0] == "/convert" || args[0] == "/fix"))
 			{
+				Application.EnableVisualStyles();
+				Application.SetCompatibleTextRenderingDefault(false);
 				frmBatch batch = new frmBatch();
 				batch.AccurateRip =
-					args[0] == "/convert" ? AccurateRipMode.VerifyAndConvert :
-					args[0] == "/fix" ? AccurateRipMode.VerifyThenConvert :
-					args[0] == "/crc" ? AccurateRipMode.VerifyPlusCRCs :
-					AccurateRipMode.Verify;
+					args[0] == "/convert" ? CUEAction.VerifyAndConvert :
+					args[0] == "/fix" ? CUEAction.VerifyThenConvert :
+					args[0] == "/crc" ? CUEAction.VerifyPlusCRCs :
+					CUEAction.Verify;

 				if (args.Length == 2 && args[1][0] != '@')
 					batch.InputPath = args[1];
@@ -45,10 +48,111 @@ namespace JDP {
 				Application.Run(batch);
 				return;
 			}
+
+			string myId = "BZ92759C-63Q7-444e-ADA6-E495634A493D";
+			Application.EnableVisualStyles();
+			Application.SetCompatibleTextRenderingDefault(false);
 			frmCUETools form = new frmCUETools();
-			if (args.Length == 1)
-				form.InputPath = args[0];
-			Application.Run(form);
+			CUEConfig config = new CUEConfig();
+			config.Load(new SettingsReader("CUE Tools", "settings.txt"));
+			if (!config.oneInstance || SingletonController.IamFirst(myId, new SingletonController.ReceiveDelegate(form.OnSecondCall)))
+			{
+				if (args.Length == 1)
+					form.InputPath = args[0];
+				Application.Run(form);
+			}
+			else
+			{
+				List<string> newArgs = new List<string>();
+				foreach (string arg in args)
+					newArgs.Add(Path.GetFullPath(arg));
+				SingletonController.Send(myId, newArgs.ToArray());
+			}
+			SingletonController.Cleanup();
 		}
 	}
+
+	[Serializable]
+    class SingletonController : MarshalByRefObject
+    {
+		private static IpcChannel m_IPCChannel = null;
+
+		public delegate void ReceiveDelegate(string[] args);
+
+        static private ReceiveDelegate m_Receive = null;
+        static public ReceiveDelegate Receiver
+        {
+            get
+            {
+                return m_Receive;
+            }
+            set
+            {
+                m_Receive = value;
+            }
+        }
+
+        public static bool IamFirst(string id, ReceiveDelegate r)
+        {
+            if (IamFirst(id))
+            {
+                Receiver += r;
+                return true;
+            }
+            else
+            {
+                return false;
+            }
+        }
+
+        public static bool IamFirst(string id)
+        {
+			try
+			{
+				m_IPCChannel = new IpcChannel(id);
+			}
+			catch
+			{
+				return false;
+			}
+			System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(m_IPCChannel, false);
+			RemotingConfiguration.RegisterWellKnownServiceType(
+				typeof(SingletonController),
+				"SingletonController",
+				WellKnownObjectMode.SingleCall);
+			return true;
+		}
+
+        public static void Cleanup()
+        {
+            if (m_IPCChannel != null)
+                m_IPCChannel.StopListening(null);
+            m_IPCChannel = null;
+        }
+
+        public static void Send(string id, string[] s)
+        {
+            SingletonController ctrl;
+            IpcChannel channel = new IpcChannel();
+			System.Runtime.Remoting.Channels.ChannelServices.RegisterChannel(channel, false);
+            try
+            {
+				ctrl = (SingletonController)Activator.GetObject(typeof(SingletonController), "ipc://" + id + "/SingletonController");
+				ctrl.Receive(s);
+			}
+            catch
+            {
+				MessageBox.Show("Another instance of the application seems to be running, but not responding.",
+					"Error", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
+        }
+
+        public void Receive(string[] s)
+        {
+            if (m_Receive != null)
+            {
+                m_Receive(s);
+            }
+        }
+    }
 }
--- a/CUETools/Properties/Resources.Designer.cs
+++ b/CUETools/Properties/Resources.Designer.cs
@@ -60,6 +60,34 @@ namespace JDP.Properties {
            }
        }
        
+        internal static System.Drawing.Bitmap accuraterip {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap accuraterip16 {
+            get {
+                object obj = ResourceManager.GetObject("accuraterip16", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Icon cue {
+            get {
+                object obj = ResourceManager.GetObject("cue", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap flac {
+            get {
+                object obj = ResourceManager.GetObject("flac", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
        internal static System.Drawing.Bitmap freedb {
            get {
                object obj = ResourceManager.GetObject("freedb", resourceCulture);
@@ -100,5 +128,19 @@ namespace JDP.Properties {
                return ResourceManager.GetString("Verify", resourceCulture);
            }
        }
+        
+        internal static System.Drawing.Bitmap wav {
+            get {
+                object obj = ResourceManager.GetObject("wav", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
+        
+        internal static System.Drawing.Bitmap wv {
+            get {
+                object obj = ResourceManager.GetObject("wv", resourceCulture);
+                return ((System.Drawing.Bitmap)(obj));
+            }
+        }
    }
 }
--- a/CUETools/Properties/Resources.resx
+++ b/CUETools/Properties/Resources.resx
@@ -117,20 +117,38 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <data name="Verify" xml:space="preserve">
+    <value>Verify</value>
+  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="accuraterip16" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\resources\accuraterip_16.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
-  <data name="Go" xml:space="preserve">
-    <value>&amp;Go</value>
-  </data>
-  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="wv" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\icon-wv.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="Stop" xml:space="preserve">
    <value>Stop</value>
  </data>
-  <data name="Verify" xml:space="preserve">
-    <value>Verify</value>
+  <data name="freedb" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\freedb.gif;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="flac" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\flac.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="accuraterip" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\accuraterip.jpg;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="musicbrainz" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\musicbrainz.ico;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="Go" xml:space="preserve">
+    <value>&amp;Go</value>
+  </data>
+  <data name="wav" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\wav.bmp;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
+  <data name="cue" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cue.ico;System.Drawing.Icon, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
 </root>
--- a/CUETools/Resources/AR.ico
+++ b/CUETools/Resources/AR.ico
--- a/CUETools/Resources/accuraterip.bmp
+++ b/CUETools/Resources/accuraterip.bmp
--- a/CUETools/Resources/accuraterip.jpg
+++ b/CUETools/Resources/accuraterip.jpg
--- a/CUETools/Resources/accuraterip_16.bmp
+++ b/CUETools/Resources/accuraterip_16.bmp
--- a/CUETools/Resources/cd.ico
+++ b/CUETools/Resources/cd.ico
--- a/CUETools/Resources/flac.ico
+++ b/CUETools/Resources/flac.ico
--- a/CUETools/Resources/icon-wv.png
+++ b/CUETools/Resources/icon-wv.png
--- a/CUETools/Resources/wav.bmp
+++ b/CUETools/Resources/wav.bmp
--- a/CUETools/frmAbout.resx
+++ b/CUETools/frmAbout.resx
@@ -265,7 +265,7 @@ hdcd.dll (c) Christopher Key</value>
    <value>CenterParent</value>
  </data>
  <data name="$this.Text" xml:space="preserve">
-    <value>About CUETools v1.9.5a</value>
+    <value>About CUETools</value>
  </data>
  <data name="&gt;&gt;$this.Name" xml:space="preserve">
    <value>frmAbout</value>
--- a/CUETools/frmBatch.cs
+++ b/CUETools/frmBatch.cs
@@ -19,7 +19,7 @@ namespace JDP
 			_config = new CUEConfig();
 			_cueStyle = CUEStyle.SingleFile;
 			_audioFormat = OutputAudioFormat.WAV;
-			_accurateRip = AccurateRipMode.Verify;
+			_accurateRip = CUEAction.Verify;
 			_batchPaths = new List<string>();
 		}

@@ -34,7 +34,7 @@ namespace JDP
 			set { pathIn = value; }
 		}

-		public AccurateRipMode AccurateRip
+		public CUEAction AccurateRip
 		{
 			get { return _accurateRip; }
 			set { _accurateRip = value; }
@@ -47,7 +47,7 @@ namespace JDP
 		OutputAudioFormat _audioFormat;
 		string pathIn;
 		string pathOut;
-		AccurateRipMode _accurateRip;
+		CUEAction _accurateRip;
 		bool _reducePriority;
 		bool _lossyWAV;
 		DateTime _startedAt;
@@ -132,8 +132,10 @@ namespace JDP
 				else
 					cueName = Path.GetFileNameWithoutExtension(pathIn) + ".cue";

-				bool outputAudio = _accurateRip != AccurateRipMode.Verify && _accurateRip != AccurateRipMode.VerifyPlusCRCs;
+				bool outputAudio = _accurateRip != CUEAction.Verify && _accurateRip != CUEAction.VerifyPlusCRCs;
+				cueSheet.Action = _accurateRip;
 				cueSheet.Open(pathIn);
+				cueSheet.Lookup();
 				if (outputAudio)
 				{
 					bool pathFound = false;
@@ -161,7 +163,6 @@ namespace JDP
 				}

 				cueSheet.UsePregapForFirstTrackInSingleFile = false;
-				cueSheet.AccurateRip = _accurateRip;
 				cueSheet.WriteAudioFiles(Path.GetDirectoryName(pathOut), _cueStyle);
 				this.Invoke((MethodInvoker)delegate()
 				{
@@ -176,7 +177,7 @@ namespace JDP
 						textBox1.Text += cueSheet.LOGContents;
 						textBox1.Show();
 					}
-					else if (cueSheet.AccurateRip != AccurateRipMode.None)
+					else if (cueSheet.Action != CUEAction.Convert)
 					{
 						StringWriter sw = new StringWriter();
 						cueSheet.GenerateAccurateRipLog(sw);
@@ -270,7 +271,7 @@ namespace JDP
 			if (_reducePriority)
 				Process.GetCurrentProcess().PriorityClass = System.Diagnostics.ProcessPriorityClass.Idle;

-			if (_accurateRip != AccurateRipMode.Verify && _accurateRip != AccurateRipMode.VerifyPlusCRCs)
+			if (_accurateRip != CUEAction.Verify && _accurateRip != CUEAction.VerifyPlusCRCs)
 				txtOutputFile.Show();

 			StartConvert();
--- a/CUETools/frmCUETools.Designer.cs
+++ b/CUETools/frmCUETools.Designer.cs
--- a/CUETools/frmCUETools.cs
+++ b/CUETools/frmCUETools.cs
--- a/CUETools/frmCUETools.de-DE.resx
+++ b/CUETools/frmCUETools.de-DE.resx
@@ -129,55 +129,10 @@
  <data name="btnBrowseOutput.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="btnBrowseInput.Text" xml:space="preserve">
-    <value>...</value>
-  </data>
-  <data name="btnBrowseInput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="lblOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>53, 13</value>
-  </data>
-  <data name="lblOutput.Text" xml:space="preserve">
-    <value>&amp;Ausgabe:</value>
-  </data>
-  <data name="lblOutput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="lblInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>49, 13</value>
-  </data>
-  <data name="lblInput.Text" xml:space="preserve">
-    <value>E&amp;ingabe:</value>
-  </data>
-  <data name="lblInput.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="txtOutputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 48</value>
-  </data>
-  <data name="txtOutputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>382, 21</value>
-  </data>
  <data name="txtOutputPath.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="txtInputPath.Location" type="System.Drawing.Point, System.Drawing">
-    <value>62, 22</value>
-  </data>
-  <data name="txtInputPath.Size" type="System.Drawing.Size, System.Drawing">
-    <value>382, 21</value>
-  </data>
-  <data name="txtInputPath.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="grpCUEPaths.Text" xml:space="preserve">
-    <value>CUE-Pfade</value>
-  </data>
-  <data name="grpCUEPaths.ToolTip" xml:space="preserve">
-    <value />
-  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
    <value>81, 17</value>
  </data>
@@ -223,12 +178,6 @@
  <data name="rbSingleFile.ToolTip" xml:space="preserve">
    <value>Erstelle einzelne Datei + CUE-Sheet</value>
  </data>
-  <data name="grpOutputStyle.Location" type="System.Drawing.Point, System.Drawing">
-    <value>97, 211</value>
-  </data>
-  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>141, 164</value>
-  </data>
  <data name="grpOutputStyle.Text" xml:space="preserve">
    <value>CUE-Stil</value>
  </data>
@@ -241,9 +190,6 @@
  <data name="btnAbout.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="txtCustomFormat.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 62</value>
-  </data>
  <data name="txtCustomFormat.Text" xml:space="preserve">
    <value>%1:-2\Neu\%-1\%F.cue</value>
  </data>
@@ -259,9 +205,6 @@
  <data name="rbCustomFormat.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="txtCreateSubdirectory.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 20</value>
-  </data>
  <data name="txtCreateSubdirectory.Text" xml:space="preserve">
    <value>Neu</value>
  </data>
@@ -295,9 +238,6 @@
  <data name="rbAppendFilename.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="txtAppendFilename.Location" type="System.Drawing.Point, System.Drawing">
-    <value>163, 42</value>
-  </data>
  <data name="txtAppendFilename.Text" xml:space="preserve">
    <value>-Neu</value>
  </data>
@@ -310,9 +250,6 @@
  <data name="grpOutputPathGeneration.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="btnCodec.Location" type="System.Drawing.Point, System.Drawing">
-    <value>61, 117</value>
-  </data>
  <data name="btnCodec.ToolTip" xml:space="preserve">
    <value />
  </data>
@@ -352,62 +289,47 @@
  <data name="rbFLAC.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="grpAudioOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>83, 164</value>
-  </data>
  <data name="grpAudioOutput.Text" xml:space="preserve">
    <value>Audio</value>
  </data>
  <data name="grpAudioOutput.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 307</value>
-  </data>
-  <data name="btnBatch.Text" xml:space="preserve">
-    <value>Stapel...</value>
-  </data>
-  <data name="btnBatch.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="btnFilenameCorrector.Text" xml:space="preserve">
-    <value>Dateinamenkorrektur...</value>
-  </data>
-  <data name="btnFilenameCorrector.ToolTip" xml:space="preserve">
-    <value />
-  </data>
  <data name="btnSettings.Text" xml:space="preserve">
    <value>Einstellungen</value>
  </data>
  <data name="btnSettings.ToolTip" xml:space="preserve">
    <value />
  </data>
+  <data name="rbActionCorrectFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkRecursive.Size" type="System.Drawing.Size, System.Drawing">
+    <value>56, 17</value>
+  </data>
+  <data name="chkRecursive.Text" xml:space="preserve">
+    <value>Stapel</value>
+  </data>
+  <data name="chkRecursive.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbActionCreateCUESheet.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkMulti.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbActionVerifyAndEncode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAction.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="label2.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="rbArPlusCRC.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 88</value>
-  </data>
-  <data name="rbArPlusCRC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>129, 17</value>
-  </data>
-  <data name="rbArPlusCRC.Text" xml:space="preserve">
-    <value>Verifiziere AR + CRCs</value>
-  </data>
-  <data name="rbArPlusCRC.ToolTip" xml:space="preserve">
-    <value>Kontaktiere die AccurateRip-Datenbank und versuche, das Image sowohl anhand dieser als auch anhand der CRC-Werte zu verifizieren</value>
-  </data>
-  <data name="rbArAndEncode.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 37</value>
-  </data>
-  <data name="rbArAndEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>144, 17</value>
-  </data>
-  <data name="rbArAndEncode.Text" xml:space="preserve">
-    <value>Kodieren und verifizieren</value>
-  </data>
-  <data name="rbArAndEncode.ToolTip" xml:space="preserve">
-    <value />
+  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>61, 13</value>
  </data>
  <data name="label1.Text" xml:space="preserve">
    <value>Datenspur:</value>
@@ -418,54 +340,29 @@
  <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
    <value>Nicht für normale Musik-CDs verwendet. Erweiterte CDs mit Datenspuren können nicht in der Datenbank gefunden werden, es sei denn, Sie kennen die Länge der Datenspur. Sie können sie oft im EAC-Log finden. Falls das EAC-Log beim CUE-Sheet gefunden wird, wird es automatisch ausgelesen, und Sie müssen hier nichts eingeben.</value>
  </data>
-  <data name="rbArApplyOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 20</value>
-  </data>
-  <data name="rbArApplyOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 17</value>
-  </data>
-  <data name="rbArApplyOffset.Text" xml:space="preserve">
-    <value>Verifizieren, &amp;dann kodieren</value>
-  </data>
-  <data name="rbArApplyOffset.ToolTip" xml:space="preserve">
-    <value>Im ersten Durchlauf verifizieren und versuchen, eine Offsetkorrektur zu finden, die das Auslesen nach der AccurateRip-Datenbank korrekt macht. Im zweiten Durchlauf unter Berücksichtigung dieser Korrektur konvertieren.</value>
-  </data>
-  <data name="rbArVerify.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 71</value>
-  </data>
-  <data name="rbArVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>108, 17</value>
-  </data>
-  <data name="rbArVerify.Text" xml:space="preserve">
-    <value>&amp;Verifiziere nur AR</value>
-  </data>
-  <data name="rbArVerify.ToolTip" xml:space="preserve">
-    <value>Kontaktiere die AccurateRip-Datenbank und versuche, das Image anhand dieser zu verifizieren</value>
-  </data>
-  <data name="rbArNone.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 54</value>
-  </data>
-  <data name="rbArNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>153, 17</value>
-  </data>
-  <data name="rbArNone.Text" xml:space="preserve">
-    <value>&amp;Nicht verifizieren, kodieren</value>
-  </data>
-  <data name="rbArNone.ToolTip" xml:space="preserve">
-    <value>Die AccurateRip-Datenbank zur Verifizierung nicht kontaktieren</value>
-  </data>
-  <data name="grpAccurateRip.ToolTip" xml:space="preserve">
-    <value />
+  <data name="toolStripStatusLabelAR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
  </data>
  <data name="statusStrip1.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="btnCUECreator.Text" xml:space="preserve">
-    <value>CUE-Sheet erstellen...</value>
-  </data>
-  <data name="btnCUECreator.ToolTip" xml:space="preserve">
-    <value />
-  </data>
  <data name="btnStop.Text" xml:space="preserve">
    <value>&amp;Stopp</value>
  </data>
@@ -508,15 +405,42 @@
  <data name="rbFreedbNever.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>FreeDB-Abfrage</value>
-  </data>
-  <data name="groupBox1.ToolTip" xml:space="preserve">
+  <data name="grpFreedb.ToolTip" xml:space="preserve">
    <value />
  </data>
  <data name="contextMenuStripUDC.ToolTip" xml:space="preserve">
    <value />
  </data>
+  <data name="txtInputPath.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textBatchReport.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="fileSystemTreeView1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpInput.Text" xml:space="preserve">
+    <value>E&amp;ingabe</value>
+  </data>
+  <data name="grpInput.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="lblWriteOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpExtra.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="contextMenuStripFileTree.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="panel1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAEBAAAAAACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAB
@@ -545,9 +469,6 @@
        AAAAAAAAAAAAAIABAADAAwAA4AcAAPAPAAA=
 </value>
  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>CUE-Tools</value>
-  </data>
  <data name="$this.ToolTip" xml:space="preserve">
    <value />
  </data>
--- a/CUETools/frmCUETools.resx
+++ b/CUETools/frmCUETools.resx
--- a/CUETools/frmCUETools.ru-RU.resx
+++ b/CUETools/frmCUETools.ru-RU.resx
@@ -117,40 +117,16 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="btnConvert.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 346</value>
-  </data>
  <data name="btnConvert.Text" xml:space="preserve">
    <value>Поехали</value>
  </data>
-  <data name="grpCUEPaths.Text" xml:space="preserve">
-    <value>Пути к файлам</value>
-  </data>
  <data name="btnBrowseOutput.Text" xml:space="preserve">
    <value>Выбор...</value>
  </data>
-  <data name="btnBrowseInput.Text" xml:space="preserve">
-    <value>Выбор...</value>
-  </data>
-  <data name="lblOutput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>44, 13</value>
-  </data>
-  <data name="lblOutput.Text" xml:space="preserve">
-    <value>Выход:</value>
-  </data>
-  <data name="lblInput.Size" type="System.Drawing.Size, System.Drawing">
-    <value>36, 13</value>
-  </data>
-  <data name="lblInput.Text" xml:space="preserve">
-    <value>&amp;Вход:</value>
-  </data>
-  <data name="grpOutputStyle.Size" type="System.Drawing.Size, System.Drawing">
-    <value>130, 164</value>
-  </data>
  <data name="grpOutputStyle.Text" xml:space="preserve">
    <value>Стиль CUE</value>
  </data>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="rbEmbedCUE.Size" type="System.Drawing.Size, System.Drawing">
    <value>86, 17</value>
  </data>
@@ -196,30 +172,18 @@
  <data name="rbSingleFile.ToolTip" xml:space="preserve">
    <value>Создать образ диска в виде одного аудио-файла и .cue файла</value>
  </data>
-  <data name="btnAbout.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 191</value>
-  </data>
  <data name="btnAbout.Text" xml:space="preserve">
    <value>О программе</value>
  </data>
-  <data name="grpOutputPathGeneration.Size" type="System.Drawing.Size, System.Drawing">
-    <value>392, 113</value>
-  </data>
  <data name="grpOutputPathGeneration.Text" xml:space="preserve">
    <value>Путь для выходных файлов</value>
  </data>
-  <data name="txtCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
  <data name="rbCustomFormat.Size" type="System.Drawing.Size, System.Drawing">
    <value>89, 17</value>
  </data>
  <data name="rbCustomFormat.Text" xml:space="preserve">
    <value>По шаблону:</value>
  </data>
-  <data name="txtCreateSubdirectory.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
  <data name="rbDontGenerate.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 17</value>
  </data>
@@ -238,9 +202,6 @@
  <data name="rbAppendFilename.Text" xml:space="preserve">
    <value>Суффикс к имени:</value>
  </data>
-  <data name="txtAppendFilename.Size" type="System.Drawing.Size, System.Drawing">
-    <value>240, 21</value>
-  </data>
  <data name="grpAudioOutput.Text" xml:space="preserve">
    <value>Формат аудио</value>
  </data>
@@ -250,41 +211,74 @@
  <data name="rbNoAudio.Text" xml:space="preserve">
    <value>Без аудио</value>
  </data>
-  <data name="btnBatch.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 315</value>
-  </data>
-  <data name="btnBatch.Text" xml:space="preserve">
-    <value>Обработать папку...</value>
-  </data>
-  <data name="btnFilenameCorrector.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 284</value>
-  </data>
-  <data name="btnFilenameCorrector.Text" xml:space="preserve">
-    <value>Исправить имена...</value>
-  </data>
-  <data name="btnSettings.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 222</value>
-  </data>
  <data name="btnSettings.Text" xml:space="preserve">
    <value>Настройки...</value>
  </data>
-  <data name="grpAccurateRip.Location" type="System.Drawing.Point, System.Drawing">
-    <value>250, 211</value>
+  <data name="rbActionCorrectFilenames.Size" type="System.Drawing.Size, System.Drawing">
+    <value>153, 17</value>
  </data>
-  <data name="grpAccurateRip.Size" type="System.Drawing.Size, System.Drawing">
-    <value>154, 164</value>
+  <data name="rbActionCorrectFilenames.Text" xml:space="preserve">
+    <value>Исправить имена файлов</value>
  </data>
-  <data name="rbArPlusCRC.Size" type="System.Drawing.Size, System.Drawing">
-    <value>115, 17</value>
+  <data name="chkRecursive.Size" type="System.Drawing.Size, System.Drawing">
+    <value>65, 17</value>
  </data>
-  <data name="rbArPlusCRC.Text" xml:space="preserve">
-    <value>Проверить + CRC</value>
+  <data name="chkRecursive.Text" xml:space="preserve">
+    <value>В папке</value>
  </data>
-  <data name="rbArAndEncode.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
+  <data name="rbActionCreateCUESheet.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 17</value>
  </data>
-  <data name="rbArAndEncode.Text" xml:space="preserve">
-    <value>Записать и проверить</value>
+  <data name="rbActionCreateCUESheet.Text" xml:space="preserve">
+    <value>Создать .cue</value>
+  </data>
+  <data name="chkMulti.Location" type="System.Drawing.Point, System.Drawing">
+    <value>81, 148</value>
+  </data>
+  <data name="chkMulti.Size" type="System.Drawing.Size, System.Drawing">
+    <value>80, 17</value>
+  </data>
+  <data name="chkMulti.Text" xml:space="preserve">
+    <value>Несколько</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Size" type="System.Drawing.Size, System.Drawing">
+    <value>109, 17</value>
+  </data>
+  <data name="rbActionVerifyAndCRCs.Text" xml:space="preserve">
+    <value>Проверка + CRC</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>154, 17</value>
+  </data>
+  <data name="rbActionVerifyAndEncode.Text" xml:space="preserve">
+    <value>Конвертация + проверка</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>147, 17</value>
+  </data>
+  <data name="rbActionVerifyThenEncode.Text" xml:space="preserve">
+    <value>Проверка, конвертация</value>
+  </data>
+  <data name="rbActionVerify.Size" type="System.Drawing.Size, System.Drawing">
+    <value>112, 17</value>
+  </data>
+  <data name="rbActionVerify.Text" xml:space="preserve">
+    <value>Только проверка</value>
+  </data>
+  <data name="rbActionEncode.Size" type="System.Drawing.Size, System.Drawing">
+    <value>92, 17</value>
+  </data>
+  <data name="rbActionEncode.Text" xml:space="preserve">
+    <value>Конвертация</value>
+  </data>
+  <data name="grpAction.Text" xml:space="preserve">
+    <value>Действие</value>
+  </data>
+  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
+    <value>41, 13</value>
+  </data>
+  <data name="label2.Text" xml:space="preserve">
+    <value>Pregap</value>
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>47, 13</value>
@@ -295,57 +289,68 @@
  <data name="txtDataTrackLength.ToolTip" xml:space="preserve">
    <value>Не используется для обычных музыкальных дисков. "Улучшенные" компакт диски с треком данных не найдутся в базе данных, если не указать длину трека данных. Её часто можно найти в логе EAC. Если лог EAC лежит в той же папке что и .cue, и имеет такое же имя как .cue файл, то он будет проанализирован автоматически и тут опять же ничего не надо будет вводить.</value>
  </data>
-  <data name="rbArApplyOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>138, 17</value>
-  </data>
-  <data name="rbArApplyOffset.Text" xml:space="preserve">
-    <value>Проверить и записать</value>
-  </data>
-  <data name="rbArApplyOffset.ToolTip" xml:space="preserve">
-    <value>На первом проходе проверить точность рипа по базе AccurateRip с учетом возможных смещений.  На втором проходе, сконвертировать, возможно с применением коррекции смещения (в зависимости от настроек)</value>
-  </data>
-  <data name="rbArVerify.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 17</value>
-  </data>
-  <data name="rbArVerify.Text" xml:space="preserve">
-    <value>Только проверить</value>
-  </data>
-  <data name="rbArVerify.ToolTip" xml:space="preserve">
-    <value>Проверить точность рипа по базе AccurateRip с учетом возможных смещений</value>
-  </data>
-  <data name="rbArNone.Size" type="System.Drawing.Size, System.Drawing">
-    <value>95, 17</value>
-  </data>
-  <data name="rbArNone.Text" xml:space="preserve">
-    <value>Не проверять</value>
-  </data>
-  <data name="rbArNone.ToolTip" xml:space="preserve">
-    <value>Сконвертировать, не обращаясь к базе данных AccurateRip</value>
-  </data>
-  <data name="btnCUECreator.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 253</value>
-  </data>
-  <data name="btnCUECreator.Text" xml:space="preserve">
-    <value>Создать CUE...</value>
-  </data>
-  <data name="btnStop.Location" type="System.Drawing.Point, System.Drawing">
-    <value>412, 346</value>
+  <data name="toolStripStatusLabelAR.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAAyNJREFUOE9tkm1P
+        mmcYhh+zbsm+Ntlf2Jd92n/Yx21p1nTZlplZ0mJD2+mYG119AakITi2tmoK0a33p1BL7MtcpXRCrKNbK
+        EEOd1qLYCigSERB5e4BjxGVZSLyTM3dyJcdx3cl9lglHHKcTHO43wk76XSH/Tl44/t4x4cP3jwsfffBW
+        mUiOt8uOlR3FCaN9KWplSaq+F5FehnItVN4ooOgroLpfoHM0i9WVoATOkz0cPP8DVBUxaiRFqAq+VqSR
+        NoPcAOqBAi0PChif5Lg3LeLeyJRKujQrKC9uFeEEZ8rTVFQWOCsv8OMVaOwW6TCDaQyGpvJYnDEW18J4
+        Vjf+lyh++JsL8g0qZLuclojITmdRSEGnBP3tPHeKr7tvh8kXB2zuwU40SjwRIp2KI1y7NcUFtQtJ4yLl
+        dUFkNVHqzqeplwRwTsKzheLWmQzLfgjs5wgn4wR3XrIbWSAVW0D4rvURZ7SzSLQuzuq8KDTb6BpizD/N
+        4VsPsvxqle2oSHBfJJTe5/XeCpGEm+TBHLmkFUF6/S6SjlFknRMoutzo9D6M19cJBGL8aRs/vCOJOP5M
+        Ar+4TlR0I+bsFMTHxZgRKnXdVGsHUGofoGmyYaybpafGw4zZR+YgSTy6j3fJy5u1ZWKBv8juPoHoCLno
+        EOz1Igyaf6OpsQtDm5mJu4sMVlmY7VwibAsRdAcITqwSsT4jNW0ns/wYvEMUXv8CwQ5S4YcIfr+f2+0G
+        luweVu2+oqCHTdsa4flNkk4/3t4xEiOjYC3C8wPklwzkvXrwtUHK8+9XGi/V011ZzYbVwda4h9BTF5HZ
+        l2z3PiRuNJIe7EIc0ZO36SjMFtvl+Yn4ytXSMjlu9WD56hzZkXESjjkyUzOE1LWk26pJ3ZRz8Gsxjy6S
+        GJcQc5tK4f+6/fxeH2MVnzMnPcmr8yfZrvmErYZPCbR+zGbHCXx3vsAx3HI0PDw8jMlkor9Zze9VUqbP
+        fckL+Slc9Z/hVJ9iUvsNN9Xf8vPVdgyG7lKJxWKhv78fvV5Pi6YZtVqFUnUZTcMltLW1qBqU1Deqi2lC
+        c6WZ9vZWbhgNh5J/AJcIo/TEh255AAAAAElFTkSuQmCC
+</value>
  </data>
  <data name="btnStop.Text" xml:space="preserve">
    <value>Стоп</value>
  </data>
-  <data name="btnPause.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 346</value>
-  </data>
  <data name="btnPause.Text" xml:space="preserve">
    <value>Пауза</value>
  </data>
-  <data name="btnResume.Location" type="System.Drawing.Point, System.Drawing">
-    <value>477, 346</value>
-  </data>
  <data name="btnResume.Text" xml:space="preserve">
    <value>&amp;Поехали</value>
  </data>
+  <data name="rbFreedbAlways.Size" type="System.Drawing.Size, System.Drawing">
+    <value>60, 17</value>
+  </data>
+  <data name="rbFreedbAlways.Text" xml:space="preserve">
+    <value>Всегда</value>
+  </data>
+  <data name="rbFreedbIf.Size" type="System.Drawing.Size, System.Drawing">
+    <value>76, 17</value>
+  </data>
+  <data name="rbFreedbIf.Text" xml:space="preserve">
+    <value>Если надо</value>
+  </data>
+  <data name="rbFreedbNever.Size" type="System.Drawing.Size, System.Drawing">
+    <value>68, 17</value>
+  </data>
+  <data name="rbFreedbNever.Text" xml:space="preserve">
+    <value>Никогда</value>
+  </data>
+  <data name="grpFreedb.Text" xml:space="preserve">
+    <value>Поиск в Freedb</value>
+  </data>
+  <data name="grpInput.Text" xml:space="preserve">
+    <value>Исходный файл</value>
+  </data>
+  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
+    <value>59, 13</value>
+  </data>
+  <data name="lblWriteOffset.Text" xml:space="preserve">
+    <value>Смещение</value>
+  </data>
+  <data name="grpExtra.Text" xml:space="preserve">
+    <value>Дополнительно</value>
+  </data>
  <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAABAAEAEBAAAAAACABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAB
--- a/CUETools/frmChoice.Designer.cs
+++ b/CUETools/frmChoice.Designer.cs
@@ -41,31 +41,24 @@ namespace JDP
 			this.Start = new System.Windows.Forms.ColumnHeader();
 			this.Length = new System.Windows.Forms.ColumnHeader();
 			this.btnEdit = new System.Windows.Forms.Button();
+			this.chkFixEncoding = new System.Windows.Forms.CheckBox();
 			this.SuspendLayout();
 			// 
 			// button1
 			// 
-			this.button1.AccessibleDescription = null;
-			this.button1.AccessibleName = null;
-			resources.ApplyResources(this.button1, "button1");
-			this.button1.BackgroundImage = null;
 			this.button1.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.button1.Font = null;
+			resources.ApplyResources(this.button1, "button1");
 			this.button1.Name = "button1";
 			this.button1.UseVisualStyleBackColor = true;
 			// 
 			// listChoices
 			// 
-			this.listChoices.AccessibleDescription = null;
-			this.listChoices.AccessibleName = null;
-			resources.ApplyResources(this.listChoices, "listChoices");
-			this.listChoices.BackgroundImage = null;
 			this.listChoices.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.columnHeader1});
-			this.listChoices.Font = null;
 			this.listChoices.FullRowSelect = true;
 			this.listChoices.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;
 			this.listChoices.HideSelection = false;
+			resources.ApplyResources(this.listChoices, "listChoices");
 			this.listChoices.MultiSelect = false;
 			this.listChoices.Name = "listChoices";
 			this.listChoices.ShowItemToolTips = true;
@@ -89,26 +82,19 @@ namespace JDP
 			// 
 			// textBox1
 			// 
-			this.textBox1.AccessibleDescription = null;
-			this.textBox1.AccessibleName = null;
-			resources.ApplyResources(this.textBox1, "textBox1");
-			this.textBox1.BackgroundImage = null;
 			this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
+			resources.ApplyResources(this.textBox1, "textBox1");
 			this.textBox1.Name = "textBox1";
 			this.textBox1.ReadOnly = true;
 			// 
 			// listTracks
 			// 
-			this.listTracks.AccessibleDescription = null;
-			this.listTracks.AccessibleName = null;
 			resources.ApplyResources(this.listTracks, "listTracks");
-			this.listTracks.BackgroundImage = null;
 			this.listTracks.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {
            this.Title,
            this.TrackNo,
            this.Start,
            this.Length});
-			this.listTracks.Font = null;
 			this.listTracks.FullRowSelect = true;
 			this.listTracks.GridLines = true;
 			this.listTracks.LabelEdit = true;
@@ -139,31 +125,30 @@ namespace JDP
 			// 
 			// btnEdit
 			// 
-			this.btnEdit.AccessibleDescription = null;
-			this.btnEdit.AccessibleName = null;
 			resources.ApplyResources(this.btnEdit, "btnEdit");
-			this.btnEdit.BackgroundImage = null;
-			this.btnEdit.Font = null;
 			this.btnEdit.Name = "btnEdit";
 			this.btnEdit.UseVisualStyleBackColor = true;
 			this.btnEdit.Click += new System.EventHandler(this.btnEdit_Click);
 			// 
+			// chkFixEncoding
+			// 
+			resources.ApplyResources(this.chkFixEncoding, "chkFixEncoding");
+			this.chkFixEncoding.Name = "chkFixEncoding";
+			this.chkFixEncoding.UseVisualStyleBackColor = true;
+			this.chkFixEncoding.CheckedChanged += new System.EventHandler(this.chkFixEncoding_CheckedChanged);
+			// 
 			// frmChoice
 			// 
 			this.AcceptButton = this.button1;
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
+			this.Controls.Add(this.chkFixEncoding);
 			this.Controls.Add(this.btnEdit);
 			this.Controls.Add(this.listTracks);
 			this.Controls.Add(this.textBox1);
 			this.Controls.Add(this.listChoices);
 			this.Controls.Add(this.button1);
-			this.Font = null;
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.Name = "frmChoice";
 			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;
@@ -187,5 +172,6 @@ namespace JDP
 		private System.Windows.Forms.ColumnHeader Length;
 		private System.Windows.Forms.Button btnEdit;
 		private System.Windows.Forms.ColumnHeader Start;
+		private System.Windows.Forms.CheckBox chkFixEncoding;
 	}
 }
--- a/CUETools/frmChoice.cs
+++ b/CUETools/frmChoice.cs
@@ -26,50 +26,47 @@ namespace JDP
 			button1.Select();
 		}

+		private ListViewItem ToItem(object i)
+		{
+			string text = "";
+			int image = -1;
+			if (i is string)
+				text = i as string;
+			else if (i is CUEToolsSourceFile)
+			{
+				text = (i as CUEToolsSourceFile).path;
+				image = 0;
+			}
+			else if (i is MusicBrainz.Release)
+			{
+				ReleaseInfo r = new ReleaseInfo(CUE, i as MusicBrainz.Release);
+				text = r.Text;
+				image = 2;
+				i = r;
+			}
+			else if (i is Freedb.CDEntry)
+			{
+				ReleaseInfo r = new ReleaseInfo(CUE, i as Freedb.CDEntry);
+				text = r.Text;
+				image = 1;
+				i = r;
+			}
+			ListViewItem item = new ListViewItem(text, image);
+			item.Tag = i;
+			return item;
+		}
+
 		public IEnumerable<object> Choices
 		{
 			set
 			{
-				bool isCD = false;
 				foreach(object i in value)
 				{
-					string text = "";
-					int image = -1;
-					if (i is string)
-						text = i as string;
-					else if (i is CUEToolsSourceFile)
-					{
-						text = (i as CUEToolsSourceFile).path;
-						image = 0;
-					}
-					else if (i is MusicBrainz.Release)
-					{
-						MusicBrainz.Release release = i as MusicBrainz.Release;
-						text = String.Format("{0}: {1} - {2}",
-							release.GetEvents().Count > 0 ? release.GetEvents()[0].Date.Substring(0, 4) : "YYYY",
-							release.GetArtist(),
-							release.GetTitle());
-						image = 2;
-						isCD = true;
-					}
-					else if (i is Freedb.CDEntry)
-					{
-						CDEntry cdEntry = i as CDEntry;
-						text = String.Format("{0}: {1} - {2}",
-							cdEntry.Year,
-							cdEntry.Artist,
-							cdEntry.Title);
-						image = 1;
-						isCD = true;
-					}
-					ListViewItem item = new ListViewItem(text, image);
-					item.Tag = i;
+					ListViewItem item = ToItem(i);
 					listChoices.Items.Add(item);
 				}
-				if (isCD)
+				if (CUE != null)
 				{
-					if (CUE == null)
-						throw new Exception("selecting release information, but cue sheet has not been set");
 					string text = String.Format("{0}: {1} - {2}",
 						CUE.Year == "" ? "YYYY" : CUE.Year,
 						CUE.Artist == "" ? "Unknown Artist" : CUE.Artist,
@@ -105,12 +102,9 @@ namespace JDP
 		private void frmChoice_FormClosing(object sender, FormClosingEventArgs e)
 		{
 			object item = ChosenObject;
-			if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || item == null)
+			if (e.CloseReason != CloseReason.None || DialogResult != DialogResult.OK || item == null || !(item is ReleaseInfo))
 				return;
-			if (item is MusicBrainz.Release)
-				CUE.FillFromMusicBrainz((MusicBrainz.Release)item);
-			else if (item is CDEntry)
-				CUE.FillFromFreedb((CDEntry)item);
+			(item as ReleaseInfo).FillCUE();
 		}

 		private void AutoResizeTracks()
@@ -128,39 +122,37 @@ namespace JDP
 			object item = ChosenObject;
 			if (item != null && item is CUEToolsSourceFile)
 			{
-				textBox1.Text = (item as CUEToolsSourceFile).contents.Replace("\r\n", "\r").Replace("\r", "\r\n");
+				textBox1.Text = (item as CUEToolsSourceFile).contents.Replace("\r\n", "\n").Replace("\r", "\n").Replace("\n", "\r\n");
+				chkFixEncoding.Visible = false;
 			}
-			else if (item != null && item is MusicBrainz.Release)
+			else if (item != null && item is ReleaseInfo)
 			{
-				MusicBrainz.Release release = item as MusicBrainz.Release;
+				ReleaseInfo r = (item as ReleaseInfo);
 				listTracks.Items.Clear();
-				foreach (MusicBrainz.Track track in release.GetTracks())
-				{
-					listTracks.Items.Add(new ListViewItem(new string[] { 
-						track.GetTitle(), 
-						(listTracks.Items.Count + 1).ToString(),
-						CUE == null ? "" : CUE.TOC[listTracks.Items.Count + 1].StartMSF,
-						CUE == null ? "" : CUE.TOC[listTracks.Items.Count + 1].LengthMSF
-					}));
-				}
-				AutoResizeTracks();
-			}
-			else if (item != null && item is CDEntry)
-			{
-				CDEntry cdEntry = item as CDEntry;
-				
-				listTracks.Items.Clear();
-				for (int i = 0; i < cdEntry.Tracks.Count; i++)
-				{
-					listTracks.Items.Add(new ListViewItem(new string[] { 
-						cdEntry.Tracks[i].Title, 						
+				if (r.musicbrainz != null)
+					foreach (MusicBrainz.Track track in r.musicbrainz.GetTracks())
+					{
+						listTracks.Items.Add(new ListViewItem(new string[] { 
+							track.GetTitle(), 
+							(listTracks.Items.Count + 1).ToString(),
+							CUE == null ? "" : CUE.TOC[listTracks.Items.Count + CUE.TOC.FirstAudio].StartMSF,
+							CUE == null ? "" : CUE.TOC[listTracks.Items.Count + CUE.TOC.FirstAudio].LengthMSF
+						}));
+					}
+				if (r.freedb != null)
+					for (int i = 0; i < r.freedb.Tracks.Count; i++)
+					{
+						listTracks.Items.Add(new ListViewItem(new string[] { 
+						r.freedb.Tracks[i].Title,
 						(i + 1).ToString(),
-						CDImageLayout.TimeToString((uint)cdEntry.Tracks[i].FrameOffset - 150),
-						CDImageLayout.TimeToString((i + 1 < cdEntry.Tracks.Count) ? (uint) (cdEntry.Tracks[i + 1].FrameOffset - cdEntry.Tracks[i].FrameOffset) :
-							(CUE == null || i >= CUE.TOC.TrackCount) ? 0 : CUE.TOC[i + 1].Length)
+						CDImageLayout.TimeToString((uint)r.freedb.Tracks[i].FrameOffset - 150),
+						CDImageLayout.TimeToString((i + 1 < r.freedb.Tracks.Count) ? (uint) (r.freedb.Tracks[i + 1].FrameOffset - r.freedb.Tracks[i].FrameOffset) :
+							(CUE == null || i >= CUE.TOC.TrackCount) ? 0 : CUE.TOC[i + CUE.TOC.FirstAudio].Length)
 					}));
-				}
+					}
 				AutoResizeTracks();
+				chkFixEncoding.Visible = r.freedb != null;
+				chkFixEncoding.Checked = r.freedb_latin1 != null;
 			}
 			else if (item != null && item is CUESheet)
 			{
@@ -176,10 +168,12 @@ namespace JDP
 					}));
 				}
 				AutoResizeTracks();
+				chkFixEncoding.Visible = false;
 			}
 			else
 			{
 				listTracks.Items.Clear();
+				chkFixEncoding.Visible = false;
 				textBox1.Text = "";
 			}
 		}
@@ -189,10 +183,8 @@ namespace JDP
 			object item = ChosenObject;
 			if (item == null || CUE == null)
 				return;
-			if (item is MusicBrainz.Release)
-				CUE.FillFromMusicBrainz((MusicBrainz.Release)item);
-			else if (item is CDEntry)
-				CUE.FillFromFreedb((CDEntry)item);
+			if (item is ReleaseInfo)
+				(item as ReleaseInfo).FillCUE();
 			else if (!(item is CUESheet))
 				return;
 			listChoices.Items[0].Selected = true;
@@ -251,5 +243,97 @@ namespace JDP
 			    }
 			}
 		}
+
+		private void chkFixEncoding_CheckedChanged(object sender, EventArgs e)
+		{
+			if (listChoices.SelectedItems.Count > 0)
+			{
+				ListViewItem item = listChoices.Items[listChoices.SelectedItems[0].Index];
+				if (item.Tag is ReleaseInfo)
+				{
+					ReleaseInfo r = item.Tag as ReleaseInfo;
+					if ((r.freedb_latin1 == null) == chkFixEncoding.Checked)
+					{
+						r.FixEncoding();
+						item.Text = r.Text;
+						for (int i = 0; i < r.freedb.Tracks.Count; i++)
+							listTracks.Items[i].Text = r.freedb.Tracks[i].Title;
+					}
+				}
+			}
+		}
+	}
+
+	sealed class ReleaseInfo
+	{
+		public Freedb.CDEntry freedb_latin1;
+		public Freedb.CDEntry freedb;
+		public MusicBrainz.Release musicbrainz;
+		public CUESheet CUE;
+		private Encoding iso;
+
+		public ReleaseInfo(CUESheet cue, Freedb.CDEntry release)
+		{
+			CUE = cue;
+			iso = Encoding.GetEncoding("iso-8859-1");
+			freedb_latin1 = null;
+			freedb = release;
+		}
+
+		public ReleaseInfo(CUESheet cue, MusicBrainz.Release release)
+		{
+			CUE = cue;
+			iso = Encoding.GetEncoding("iso-8859-1");
+			musicbrainz = release;
+		}
+
+		private string FixEncoding(string src)
+		{
+			return Encoding.Default.GetString(iso.GetBytes(src));
+		}
+
+		public string Text
+		{
+			get
+			{
+				if (musicbrainz != null)
+					return string.Format("{0}: {1} - {2}",
+						musicbrainz.GetEvents().Count > 0 ? musicbrainz.GetEvents()[0].Date.Substring(0, 4) : "YYYY",
+						musicbrainz.GetArtist(),
+						musicbrainz.GetTitle());
+				if (freedb != null)
+					return string.Format("{0}: {1} - {2}",
+						freedb.Year,
+						freedb.Artist,
+						freedb.Title);
+				return null;
+			}
+		}
+
+		public void FixEncoding()
+		{
+			if (freedb == null)
+				return;
+			if (freedb_latin1 != null)
+			{
+				freedb = freedb_latin1;
+				freedb_latin1 = null;
+				return;
+			}
+			freedb_latin1 = freedb;
+			freedb = new Freedb.CDEntry(freedb_latin1);
+			freedb.Artist = FixEncoding(freedb.Artist);
+			freedb.Title = FixEncoding(freedb.Title);
+			foreach (Freedb.Track tr in freedb.Tracks)
+				tr.Title = FixEncoding(tr.Title);
+		}
+
+		public void FillCUE()
+		{
+			if (musicbrainz != null)
+				CUE.FillFromMusicBrainz(musicbrainz);
+			else if (freedb != null)
+				CUE.FillFromFreedb(freedb);
+		}
 	}
 }
--- a/CUETools/frmChoice.resx
+++ b/CUETools/frmChoice.resx
@@ -117,28 +117,50 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>488, 293</value>
+  </data>
+  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="listChoices.TabIndex" type="System.Int32, mscorlib">
-    <value>24</value>
+  <data name="button1.TabIndex" type="System.Int32, mscorlib">
+    <value>23</value>
  </data>
-  <data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listTracks.Visible" type="System.Boolean, mscorlib">
-    <value>False</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="button1.Text" xml:space="preserve">
+    <value>Ok</value>
  </data>
  <data name="&gt;&gt;button1.Name" xml:space="preserve">
    <value>button1</value>
  </data>
+  <data name="&gt;&gt;button1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
+    <value>5</value>
+  </data>
+  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
+    <value>520</value>
+  </data>
+  <data name="listChoices.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 12</value>
+  </data>
+  <data name="listChoices.Size" type="System.Drawing.Size, System.Drawing">
+    <value>551, 72</value>
+  </data>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 17</value>
+  </metadata>
  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
-        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAq
-        CwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEEAQABEAEAARABAAT/AQkBEAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAAAo
+        CwAAAk1TRnQBSQFMAgEBBAEAAQwBAAEEAQABEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAASADAAEBAQABCAYAAQgYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@@ -185,142 +207,81 @@
        AesB7wMAAf8CBAHsDP8HrgERAQABDwHrAbwB/wEAAq4DAAHvAesB7wTzAe8B6wHvBwAB7wbrAe8EABD/
        AQAJrgEPAQABEwERAa4GAAbrBQABQgFNAT4HAAE+AwABKAMAAUADAAEgAwABAQEAAQEGAAEBFgAD/4EA
        AfgBHwIAAYABAQH4AR8B4AEHBAAB4AEHAcABAwQAAcABAwGAAQEEAAGAAQEGAAGAAQE2AAGAAQEBgAEB
-        BAABgAEBAcABAwQAAcABAwHgAQcEAAHgAQcB8AEPAgABgAEBAfgBHxYACw==
+        BAABgAEBAcABAwQAAcABAwHgAQcEAAHgAQcB8AEPAgABgAEBAfgBHws=
 </value>
  </data>
-  <data name="columnHeader1.Width" type="System.Int32, mscorlib">
-    <value>540</value>
+  <data name="listChoices.TabIndex" type="System.Int32, mscorlib">
+    <value>24</value>
  </data>
-  <data name="TrackNo.DisplayIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="&gt;&gt;listChoices.Name" xml:space="preserve">
+    <value>listChoices</value>
  </data>
-  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
+  <data name="&gt;&gt;listChoices.Type" xml:space="preserve">
    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;listChoices.Parent" xml:space="preserve">
+    <value>$this</value>
  </data>
-  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
-    <value>1</value>
+  <data name="&gt;&gt;listChoices.ZOrder" xml:space="preserve">
+    <value>4</value>
  </data>
-  <data name="TrackNo.Text" xml:space="preserve">
-    <value>#</value>
+  <data name="textBox1.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Courier New, 8pt</value>
  </data>
-  <data name="&gt;&gt;columnHeader1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 90</value>
  </data>
-  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="button1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>488, 293</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>575, 328</value>
-  </data>
-  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="&gt;&gt;Length.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="textBox1.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="textBox1.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
    <value>Vertical</value>
  </data>
-  <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Left, Right</value>
-  </data>
-  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
    <value>551, 197</value>
  </data>
+  <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
+    <value>25</value>
+  </data>
  <data name="&gt;&gt;textBox1.Name" xml:space="preserve">
    <value>textBox1</value>
  </data>
-  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listChoices.Size" type="System.Drawing.Size, System.Drawing">
-    <value>551, 72</value>
-  </data>
-  <data name="&gt;&gt;listChoices.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="Start.Text" xml:space="preserve">
-    <value>Start</value>
-  </data>
-  <data name="&gt;&gt;Start.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;listChoices.ZOrder" xml:space="preserve">
-    <value>3</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;button1.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
-    <value>listTracks</value>
-  </data>
-  <data name="textBox1.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="Start.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
  <data name="&gt;&gt;textBox1.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;button1.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;textBox1.Parent" xml:space="preserve">
+    <value>$this</value>
  </data>
-  <data name="&gt;&gt;listChoices.Name" xml:space="preserve">
-    <value>listChoices</value>
+  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
+    <value>3</value>
  </data>
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>CenterParent</value>
+  <data name="listTracks.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
  </data>
  <data name="listTracks.Location" type="System.Drawing.Point, System.Drawing">
    <value>12, 90</value>
  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
-    <value>btnEdit</value>
-  </data>
-  <data name="textBox1.Size" type="System.Drawing.Size, System.Drawing">
+  <data name="listTracks.Size" type="System.Drawing.Size, System.Drawing">
    <value>551, 197</value>
  </data>
-  <data name="&gt;&gt;TrackNo.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
+    <value>26</value>
  </data>
-  <data name="button1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>75, 23</value>
-  </data>
-  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
-    <value>407, 293</value>
-  </data>
-  <data name="&gt;&gt;textBox1.ZOrder" xml:space="preserve">
-    <value>2</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="btnEdit.Text" xml:space="preserve">
-    <value>Edit</value>
-  </data>
-  <data name="&gt;&gt;Title.Name" xml:space="preserve">
-    <value>Title</value>
-  </data>
-  <data name="btnEdit.Visible" type="System.Boolean, mscorlib">
+  <data name="listTracks.Visible" type="System.Boolean, mscorlib">
    <value>False</value>
  </data>
-  <data name="&gt;&gt;btnEdit.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;listTracks.Name" xml:space="preserve">
+    <value>listTracks</value>
  </data>
-  <data name="button1.Text" xml:space="preserve">
-    <value>Ok</value>
+  <data name="&gt;&gt;listTracks.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ListView, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;listTracks.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;listTracks.ZOrder" xml:space="preserve">
+    <value>2</value>
  </data>
  <data name="Title.DisplayIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -328,73 +289,139 @@
  <data name="Title.Text" xml:space="preserve">
    <value>Title</value>
  </data>
-  <data name="textBox1.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Courier New, 8pt</value>
-  </data>
-  <data name="&gt;&gt;Title.Type" xml:space="preserve">
-    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Select the best match</value>
-  </data>
  <data name="Title.Width" type="System.Int32, mscorlib">
    <value>360</value>
  </data>
-  <data name="&gt;&gt;listChoices.Parent" xml:space="preserve">
-    <value>$this</value>
+  <data name="TrackNo.DisplayIndex" type="System.Int32, mscorlib">
+    <value>0</value>
  </data>
-  <data name="&gt;&gt;TrackNo.Name" xml:space="preserve">
-    <value>TrackNo</value>
-  </data>
-  <data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
-    <value>columnHeader1</value>
-  </data>
-  <data name="button1.TabIndex" type="System.Int32, mscorlib">
-    <value>23</value>
-  </data>
-  <data name="&gt;&gt;button1.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="listTracks.TabIndex" type="System.Int32, mscorlib">
-    <value>26</value>
-  </data>
-  <data name="textBox1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 90</value>
-  </data>
-  <data name="listChoices.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 12</value>
-  </data>
-  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
-    <value>imageList1</value>
+  <data name="TrackNo.Text" xml:space="preserve">
+    <value>#</value>
  </data>
  <data name="TrackNo.Width" type="System.Int32, mscorlib">
    <value>30</value>
  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmChoice</value>
-  </data>
-  <data name="Length.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
-  <data name="&gt;&gt;Start.Name" xml:space="preserve">
+  <data name="Start.Text" xml:space="preserve">
    <value>Start</value>
  </data>
-  <data name="textBox1.TabIndex" type="System.Int32, mscorlib">
-    <value>25</value>
-  </data>
-  <data name="&gt;&gt;Length.Name" xml:space="preserve">
-    <value>Length</value>
-  </data>
-  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
-    <value>27</value>
+  <data name="Start.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Right</value>
  </data>
  <data name="Length.Text" xml:space="preserve">
    <value>Length</value>
  </data>
+  <data name="Length.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
+    <value>Right</value>
+  </data>
+  <data name="btnEdit.Location" type="System.Drawing.Point, System.Drawing">
+    <value>407, 293</value>
+  </data>
+  <data name="btnEdit.Size" type="System.Drawing.Size, System.Drawing">
+    <value>75, 23</value>
+  </data>
+  <data name="btnEdit.TabIndex" type="System.Int32, mscorlib">
+    <value>27</value>
+  </data>
+  <data name="btnEdit.Text" xml:space="preserve">
+    <value>Edit</value>
+  </data>
+  <data name="btnEdit.Visible" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Name" xml:space="preserve">
+    <value>btnEdit</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;btnEdit.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="chkFixEncoding.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="chkFixEncoding.Location" type="System.Drawing.Point, System.Drawing">
+    <value>315, 297</value>
+  </data>
+  <data name="chkFixEncoding.Size" type="System.Drawing.Size, System.Drawing">
+    <value>86, 17</value>
+  </data>
+  <data name="chkFixEncoding.TabIndex" type="System.Int32, mscorlib">
+    <value>28</value>
+  </data>
+  <data name="chkFixEncoding.Text" xml:space="preserve">
+    <value>Fix encoding</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Name" xml:space="preserve">
+    <value>chkFixEncoding</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;chkFixEncoding.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
-  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>575, 328</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Select the best match</value>
+  </data>
+  <data name="&gt;&gt;columnHeader1.Name" xml:space="preserve">
+    <value>columnHeader1</value>
+  </data>
+  <data name="&gt;&gt;columnHeader1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
+    <value>imageList1</value>
+  </data>
+  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Title.Name" xml:space="preserve">
+    <value>Title</value>
+  </data>
+  <data name="&gt;&gt;Title.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;TrackNo.Name" xml:space="preserve">
+    <value>TrackNo</value>
+  </data>
+  <data name="&gt;&gt;TrackNo.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Start.Name" xml:space="preserve">
+    <value>Start</value>
+  </data>
+  <data name="&gt;&gt;Start.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;Length.Name" xml:space="preserve">
+    <value>Length</value>
+  </data>
+  <data name="&gt;&gt;Length.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ColumnHeader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmChoice</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/CUETools/frmFilenameCorrector.Designer.cs
+++ b/CUETools/frmFilenameCorrector.Designer.cs
@@ -29,23 +29,16 @@ namespace JDP {
 			// 
 			// lblDescription
 			// 
-			this.lblDescription.AccessibleDescription = null;
-			this.lblDescription.AccessibleName = null;
 			resources.ApplyResources(this.lblDescription, "lblDescription");
-			this.lblDescription.Font = null;
 			this.lblDescription.Name = "lblDescription";
 			// 
 			// frmFilenameCorrector
 			// 
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			this.AllowDrop = true;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
 			this.Controls.Add(this.lblDescription);
 			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.Name = "frmFilenameCorrector";
 			this.TopMost = true;
--- a/CUETools/frmFilenameCorrector.resx
+++ b/CUETools/frmFilenameCorrector.resx
@@ -117,13 +117,9 @@
  <resheader name="writer">
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>Manual</value>
-  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>286, 159</value>
+  <data name="lblDescription.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
  </data>
  <data name="lblDescription.Size" type="System.Drawing.Size, System.Drawing">
    <value>272, 144</value>
@@ -132,43 +128,47 @@
  <data name="lblDescription.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
-  <data name="&gt;&gt;lblDescription.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmFilenameCorrector</value>
+  <data name="lblDescription.Text" xml:space="preserve">
+    <value>Drop CUE sheets here to correct the audio filenames contained inside. The audio files must be located in the same folder as the CUE sheet. The number of audio files in that folder must match the number of files referenced by the CUE sheet. The audio files must be named such that when sorted they are in order by track number.  To correct multiple CUE sheets at once, you can drop the search results for *.cue.</value>
  </data>
  <data name="lblDescription.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
    <value>MiddleLeft</value>
  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Filename Corrector</value>
-  </data>
  <data name="&gt;&gt;lblDescription.Name" xml:space="preserve">
    <value>lblDescription</value>
  </data>
-  <data name="lblDescription.Text" xml:space="preserve">
-    <value>Drop CUE sheets here to correct the audio filenames contained inside. The audio files must be located in the same folder as the CUE sheet. The number of audio files in that folder must match the number of files referenced by the CUE sheet. The audio files must be named such that when sorted they are in order by track number.  To correct multiple CUE sheets at once, you can drop the search results for *.cue.</value>
-  </data>
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="lblDescription.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
  <data name="&gt;&gt;lblDescription.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;lblDescription.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
  <data name="&gt;&gt;lblDescription.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>286, 159</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>Manual</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Filename Corrector</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmFilenameCorrector</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/CUETools/frmReport.Designer.cs
+++ b/CUETools/frmReport.Designer.cs
@@ -35,36 +35,26 @@ namespace JDP
 			// 
 			// btnClose
 			// 
-			this.btnClose.AccessibleDescription = null;
-			this.btnClose.AccessibleName = null;
 			resources.ApplyResources(this.btnClose, "btnClose");
-			this.btnClose.BackgroundImage = null;
 			this.btnClose.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.btnClose.Font = null;
 			this.btnClose.Name = "btnClose";
 			this.btnClose.UseVisualStyleBackColor = true;
 			// 
 			// txtReport
 			// 
-			this.txtReport.AccessibleDescription = null;
-			this.txtReport.AccessibleName = null;
 			resources.ApplyResources(this.txtReport, "txtReport");
 			this.txtReport.BackColor = System.Drawing.SystemColors.Control;
-			this.txtReport.BackgroundImage = null;
+			this.txtReport.BorderStyle = System.Windows.Forms.BorderStyle.None;
 			this.txtReport.Name = "txtReport";
 			this.txtReport.ReadOnly = true;
 			// 
 			// frmReport
 			// 
-			this.AccessibleDescription = null;
-			this.AccessibleName = null;
 			resources.ApplyResources(this, "$this");
 			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-			this.BackgroundImage = null;
 			this.CancelButton = this.btnClose;
 			this.Controls.Add(this.txtReport);
 			this.Controls.Add(this.btnClose);
-			this.Icon = null;
 			this.MaximizeBox = false;
 			this.MinimizeBox = false;
 			this.Name = "frmReport";
--- a/CUETools/frmReport.resx
+++ b/CUETools/frmReport.resx
@@ -118,90 +118,96 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
-    <value>Manual</value>
-  </data>
-  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="txtReport.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="&gt;&gt;$this.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Name" xml:space="preserve">
-    <value>txtReport</value>
+  <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Right</value>
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>6, 13</value>
-  </data>
-  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
-    <value>1</value>
-  </data>
-  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>556, 376</value>
-  </data>
-  <data name="&gt;&gt;$this.Name" xml:space="preserve">
-    <value>frmReport</value>
-  </data>
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>400, 300</value>
-  </data>
-  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="txtReport.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
-    <value>Vertical</value>
+  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
+    <value>478, 354</value>
  </data>
  <data name="btnClose.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 23</value>
  </data>
-  <data name="btnClose.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Bottom</value>
-  </data>
-  <data name="$this.Text" xml:space="preserve">
-    <value>Status Report</value>
-  </data>
-  <data name="txtReport.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Courier New, 8.25pt</value>
-  </data>
-  <data name="&gt;&gt;txtReport.ZOrder" xml:space="preserve">
+  <assembly alias="mscorlib" name="mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="btnClose.TabIndex" type="System.Int32, mscorlib">
    <value>0</value>
  </data>
  <data name="btnClose.Text" xml:space="preserve">
    <value>Close</value>
  </data>
-  <data name="txtReport.Size" type="System.Drawing.Size, System.Drawing">
-    <value>540, 327</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Type" xml:space="preserve">
-    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;btnClose.Name" xml:space="preserve">
    <value>btnClose</value>
  </data>
-  <data name="txtReport.Multiline" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="&gt;&gt;txtReport.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="txtReport.Location" type="System.Drawing.Point, System.Drawing">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Tahoma, 8.25pt</value>
-  </data>
  <data name="&gt;&gt;btnClose.Type" xml:space="preserve">
    <value>System.Windows.Forms.Button, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="&gt;&gt;btnClose.Parent" xml:space="preserve">
    <value>$this</value>
  </data>
-  <data name="btnClose.Location" type="System.Drawing.Point, System.Drawing">
-    <value>243, 345</value>
+  <data name="&gt;&gt;btnClose.ZOrder" xml:space="preserve">
+    <value>1</value>
+  </data>
+  <data name="txtReport.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left, Right</value>
+  </data>
+  <data name="txtReport.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Courier New, 8.25pt</value>
+  </data>
+  <data name="txtReport.Location" type="System.Drawing.Point, System.Drawing">
+    <value>8, 8</value>
+  </data>
+  <data name="txtReport.Multiline" type="System.Boolean, mscorlib">
+    <value>True</value>
+  </data>
+  <data name="txtReport.ScrollBars" type="System.Windows.Forms.ScrollBars, System.Windows.Forms">
+    <value>Both</value>
+  </data>
+  <data name="txtReport.Size" type="System.Drawing.Size, System.Drawing">
+    <value>536, 340</value>
+  </data>
+  <data name="txtReport.TabIndex" type="System.Int32, mscorlib">
+    <value>1</value>
+  </data>
+  <data name="txtReport.WordWrap" type="System.Boolean, mscorlib">
+    <value>False</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Name" xml:space="preserve">
+    <value>txtReport</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Type" xml:space="preserve">
+    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
+  <data name="&gt;&gt;txtReport.Parent" xml:space="preserve">
+    <value>$this</value>
+  </data>
+  <data name="&gt;&gt;txtReport.ZOrder" xml:space="preserve">
+    <value>0</value>
  </data>
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
+    <value>6, 13</value>
+  </data>
+  <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
+    <value>556, 389</value>
+  </data>
+  <data name="$this.Font" type="System.Drawing.Font, System.Drawing">
+    <value>Tahoma, 8.25pt</value>
+  </data>
+  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
+    <value>400, 300</value>
+  </data>
+  <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
+    <value>CenterParent</value>
+  </data>
+  <data name="$this.Text" xml:space="preserve">
+    <value>Status Report</value>
+  </data>
+  <data name="&gt;&gt;$this.Name" xml:space="preserve">
+    <value>frmReport</value>
+  </data>
+  <data name="&gt;&gt;$this.Type" xml:space="preserve">
+    <value>System.Windows.Forms.Form, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
 </root>
--- a/CUETools/frmSettings.Designer.cs
+++ b/CUETools/frmSettings.Designer.cs
@@ -27,6 +27,7 @@ namespace JDP {
 			System.Windows.Forms.Button btnCancel;
 			System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmSettings));
 			this.grpGeneral = new System.Windows.Forms.GroupBox();
+			this.chkSingleInstance = new System.Windows.Forms.CheckBox();
 			this.chkOverwriteTags = new System.Windows.Forms.CheckBox();
 			this.chkExtractLog = new System.Windows.Forms.CheckBox();
 			this.chkReducePriority = new System.Windows.Forms.CheckBox();
@@ -35,10 +36,8 @@ namespace JDP {
 			this.chkCreateM3U = new System.Windows.Forms.CheckBox();
 			this.chkFillUpCUE = new System.Windows.Forms.CheckBox();
 			this.chkEmbedLog = new System.Windows.Forms.CheckBox();
-			this.numericWriteOffset = new System.Windows.Forms.NumericUpDown();
 			this.chkAutoCorrectFilenames = new System.Windows.Forms.CheckBox();
 			this.chkPreserveHTOA = new System.Windows.Forms.CheckBox();
-			this.lblWriteOffset = new System.Windows.Forms.Label();
 			this.numericFLACCompressionLevel = new System.Windows.Forms.NumericUpDown();
 			this.lblFLACCompressionLevel = new System.Windows.Forms.Label();
 			this.chkFLACVerify = new System.Windows.Forms.CheckBox();
@@ -111,12 +110,12 @@ namespace JDP {
 			this.label4 = new System.Windows.Forms.Label();
 			this.label3 = new System.Windows.Forms.Label();
 			this.label2 = new System.Windows.Forms.Label();
+			this.imageList1 = new System.Windows.Forms.ImageList(this.components);
 			this.tabPage4 = new System.Windows.Forms.TabPage();
 			this.grpHDCD = new System.Windows.Forms.GroupBox();
 			this.chkHDCDDetect = new System.Windows.Forms.CheckBox();
 			btnCancel = new System.Windows.Forms.Button();
 			this.grpGeneral.SuspendLayout();
-			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).BeginInit();
 			((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).BeginInit();
 			this.groupBox1.SuspendLayout();
@@ -159,6 +158,7 @@ namespace JDP {
 			this.grpGeneral.AccessibleName = null;
 			resources.ApplyResources(this.grpGeneral, "grpGeneral");
 			this.grpGeneral.BackgroundImage = null;
+			this.grpGeneral.Controls.Add(this.chkSingleInstance);
 			this.grpGeneral.Controls.Add(this.chkOverwriteTags);
 			this.grpGeneral.Controls.Add(this.chkExtractLog);
 			this.grpGeneral.Controls.Add(this.chkReducePriority);
@@ -167,15 +167,24 @@ namespace JDP {
 			this.grpGeneral.Controls.Add(this.chkCreateM3U);
 			this.grpGeneral.Controls.Add(this.chkFillUpCUE);
 			this.grpGeneral.Controls.Add(this.chkEmbedLog);
-			this.grpGeneral.Controls.Add(this.numericWriteOffset);
 			this.grpGeneral.Controls.Add(this.chkAutoCorrectFilenames);
 			this.grpGeneral.Controls.Add(this.chkPreserveHTOA);
-			this.grpGeneral.Controls.Add(this.lblWriteOffset);
 			this.grpGeneral.Font = null;
 			this.grpGeneral.Name = "grpGeneral";
 			this.grpGeneral.TabStop = false;
 			this.toolTip1.SetToolTip(this.grpGeneral, resources.GetString("grpGeneral.ToolTip"));
 			// 
+			// chkSingleInstance
+			// 
+			this.chkSingleInstance.AccessibleDescription = null;
+			this.chkSingleInstance.AccessibleName = null;
+			resources.ApplyResources(this.chkSingleInstance, "chkSingleInstance");
+			this.chkSingleInstance.BackgroundImage = null;
+			this.chkSingleInstance.Font = null;
+			this.chkSingleInstance.Name = "chkSingleInstance";
+			this.toolTip1.SetToolTip(this.chkSingleInstance, resources.GetString("chkSingleInstance.ToolTip"));
+			this.chkSingleInstance.UseVisualStyleBackColor = true;
+			// 
 			// chkOverwriteTags
 			// 
 			this.chkOverwriteTags.AccessibleDescription = null;
@@ -265,25 +274,6 @@ namespace JDP {
 			this.toolTip1.SetToolTip(this.chkEmbedLog, resources.GetString("chkEmbedLog.ToolTip"));
 			this.chkEmbedLog.UseVisualStyleBackColor = true;
 			// 
-			// numericWriteOffset
-			// 
-			this.numericWriteOffset.AccessibleDescription = null;
-			this.numericWriteOffset.AccessibleName = null;
-			resources.ApplyResources(this.numericWriteOffset, "numericWriteOffset");
-			this.numericWriteOffset.Font = null;
-			this.numericWriteOffset.Maximum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            0});
-			this.numericWriteOffset.Minimum = new decimal(new int[] {
-            99999,
-            0,
-            0,
-            -2147483648});
-			this.numericWriteOffset.Name = "numericWriteOffset";
-			this.toolTip1.SetToolTip(this.numericWriteOffset, resources.GetString("numericWriteOffset.ToolTip"));
-			// 
 			// chkAutoCorrectFilenames
 			// 
 			this.chkAutoCorrectFilenames.AccessibleDescription = null;
@@ -306,15 +296,6 @@ namespace JDP {
 			this.toolTip1.SetToolTip(this.chkPreserveHTOA, resources.GetString("chkPreserveHTOA.ToolTip"));
 			this.chkPreserveHTOA.UseVisualStyleBackColor = true;
 			// 
-			// lblWriteOffset
-			// 
-			this.lblWriteOffset.AccessibleDescription = null;
-			this.lblWriteOffset.AccessibleName = null;
-			resources.ApplyResources(this.lblWriteOffset, "lblWriteOffset");
-			this.lblWriteOffset.Font = null;
-			this.lblWriteOffset.Name = "lblWriteOffset";
-			this.toolTip1.SetToolTip(this.lblWriteOffset, resources.GetString("lblWriteOffset.ToolTip"));
-			// 
 			// numericFLACCompressionLevel
 			// 
 			this.numericFLACCompressionLevel.AccessibleDescription = null;
@@ -1008,6 +989,7 @@ namespace JDP {
 			this.tabControl2.Controls.Add(this.tabPage8);
 			this.tabControl2.Controls.Add(this.tabPage9);
 			this.tabControl2.Font = null;
+			this.tabControl2.ImageList = this.imageList1;
 			this.tabControl2.Multiline = true;
 			this.tabControl2.Name = "tabControl2";
 			this.tabControl2.SelectedIndex = 0;
@@ -1018,6 +1000,7 @@ namespace JDP {
 			this.tabPage5.AccessibleDescription = null;
 			this.tabPage5.AccessibleName = null;
 			resources.ApplyResources(this.tabPage5, "tabPage5");
+			this.tabPage5.BackColor = System.Drawing.Color.Transparent;
 			this.tabPage5.BackgroundImage = null;
 			this.tabPage5.Controls.Add(this.numericFLACCompressionLevel);
 			this.tabPage5.Controls.Add(this.lblFLACCompressionLevel);
@@ -1242,6 +1225,13 @@ namespace JDP {
 			this.label2.Name = "label2";
 			this.toolTip1.SetToolTip(this.label2, resources.GetString("label2.ToolTip"));
 			// 
+			// imageList1
+			// 
+			this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream")));
+			this.imageList1.TransparentColor = System.Drawing.Color.Transparent;
+			this.imageList1.Images.SetKeyName(0, "flac");
+			this.imageList1.Images.SetKeyName(1, "wv");
+			// 
 			// tabPage4
 			// 
 			this.tabPage4.AccessibleDescription = null;
@@ -1306,7 +1296,6 @@ namespace JDP {
 			this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmSettings_FormClosing);
 			this.grpGeneral.ResumeLayout(false);
 			this.grpGeneral.PerformLayout();
-			((System.ComponentModel.ISupportInitialize)(this.numericWriteOffset)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numericFLACCompressionLevel)).EndInit();
 			((System.ComponentModel.ISupportInitialize)(this.numWVExtraMode)).EndInit();
 			this.groupBox1.ResumeLayout(false);
@@ -1347,7 +1336,6 @@ namespace JDP {

 		private System.Windows.Forms.GroupBox grpGeneral;
 		private System.Windows.Forms.CheckBox chkPreserveHTOA;
-		private System.Windows.Forms.Label lblWriteOffset;
 		private System.Windows.Forms.Label lblFLACCompressionLevel;
 		private System.Windows.Forms.CheckBox chkFLACVerify;
 		private System.Windows.Forms.Button btnOK;
@@ -1360,7 +1348,6 @@ namespace JDP {
 		private System.Windows.Forms.GroupBox groupBox1;
 		private System.Windows.Forms.CheckBox chkWriteArTagsOnConvert;
 		private System.Windows.Forms.NumericUpDown numericFLACCompressionLevel;
-		private System.Windows.Forms.NumericUpDown numericWriteOffset;
 		private System.Windows.Forms.ToolTip toolTip1;
 		private System.Windows.Forms.NumericUpDown numFixWhenPercent;
 		private System.Windows.Forms.Label labelFixWhenPercent;
@@ -1433,6 +1420,8 @@ namespace JDP {
 		private System.Windows.Forms.TextBox textUDC1Encoder;
 		private System.Windows.Forms.CheckBox chkUDC1APEv2;
 		private System.Windows.Forms.CheckBox chkUDC1ID3v2;
+		private System.Windows.Forms.ImageList imageList1;
+		private System.Windows.Forms.CheckBox chkSingleInstance;

 	}
 }
--- a/CUETools/frmSettings.cs
+++ b/CUETools/frmSettings.cs
@@ -8,7 +8,6 @@ using CUETools.Processor;

 namespace JDP {
 	public partial class frmSettings : Form {
-		int _writeOffset;
 		bool _reducePriority;
 		CUEConfig _config;

@@ -18,7 +17,6 @@ namespace JDP {

 		private void frmSettings_Load(object sender, EventArgs e) {
 			chkReducePriority.Checked = _reducePriority;
-			numericWriteOffset.Value = _writeOffset;
 			chkPreserveHTOA.Checked = _config.preserveHTOA;
 			chkAutoCorrectFilenames.Checked = _config.autoCorrectFilenames;
 			numericFLACCompressionLevel.Value = _config.flacCompressionLevel;
@@ -69,6 +67,7 @@ namespace JDP {
 			chkHDCDLW16.Checked = _config.decodeHDCDtoLW16;
 			chkHDCD24bit.Checked = _config.decodeHDCDto24bit;
 			chkOverwriteTags.Checked = _config.overwriteCUEData;
+			chkSingleInstance.Checked = _config.oneInstance;

 			textUDC1Extension.Text = _config.udc1Extension;
 			textUDC1Decoder.Text = _config.udc1Decoder;
@@ -83,11 +82,6 @@ namespace JDP {
 		private void frmSettings_FormClosing(object sender, FormClosingEventArgs e) {
 		}

-		public int WriteOffset {
-			get { return _writeOffset; }
-			set { _writeOffset = value; }
-		}
-
 		public bool ReducePriority
 		{
 			get { return _reducePriority; }
@@ -105,7 +99,6 @@ namespace JDP {

 		private void btnOK_Click(object sender, EventArgs e)
 		{
-			_writeOffset = (int)numericWriteOffset.Value;
 			_reducePriority = chkReducePriority.Checked;
 			_config.preserveHTOA = chkPreserveHTOA.Checked;
 			_config.autoCorrectFilenames = chkAutoCorrectFilenames.Checked;
@@ -154,6 +147,7 @@ namespace JDP {
 			_config.decodeHDCDtoLW16 = chkHDCDLW16.Checked;
 			_config.decodeHDCDto24bit = chkHDCD24bit.Checked;
 			_config.overwriteCUEData = chkOverwriteTags.Checked;
+			_config.oneInstance = chkSingleInstance.Checked;

 			_config.udc1Extension = textUDC1Extension.Text;
 			_config.udc1Decoder = textUDC1Decoder.Text;
--- a/CUETools/frmSettings.resx
+++ b/CUETools/frmSettings.resx
@@ -178,7 +178,7 @@
    <value>Top, Left, Right</value>
  </data>
  <data name="tabPage6.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
  </data>
  <data name="grpAudioFilenames.TabIndex" type="System.Int32, mscorlib">
    <value>1</value>
@@ -198,9 +198,6 @@
  <data name="chkTruncateExtra4206Samples.ToolTip" xml:space="preserve">
    <value>Some erroneous FLAC encoders add extra 4608 zero samples at the end of each file. These extra samples can be detected  and removed.</value>
  </data>
-  <data name="btnOK.Text" xml:space="preserve">
-    <value>OK</value>
-  </data>
  <data name="&gt;&gt;toolTip1.Name" xml:space="preserve">
    <value>toolTip1</value>
  </data>
@@ -276,9 +273,6 @@
  <data name="&gt;&gt;rbWVHigh.Type" xml:space="preserve">
    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;numericWriteOffset.Name" xml:space="preserve">
-    <value>numericWriteOffset</value>
-  </data>
  <data name="label4.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 63</value>
  </data>
@@ -292,7 +286,7 @@
    <value>Write AccurateRip tags</value>
  </data>
  <data name="tabPage6.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
  </data>
  <data name="chkUDC1ID3v2.Size" type="System.Drawing.Size, System.Drawing">
    <value>79, 17</value>
@@ -363,6 +357,9 @@
  <data name="lblTrackFilenameFormat.Text" xml:space="preserve">
    <value>Track format:</value>
  </data>
+  <data name="&gt;&gt;imageList1.Type" xml:space="preserve">
+    <value>System.Windows.Forms.ImageList, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="tabPage7.TabIndex" type="System.Int32, mscorlib">
    <value>2</value>
  </data>
@@ -381,6 +378,9 @@
  <data name="chkReplaceSpaces.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
    <value>NoControl</value>
  </data>
+  <data name="&gt;&gt;chkSingleInstance.Name" xml:space="preserve">
+    <value>chkSingleInstance</value>
+  </data>
  <data name="&gt;&gt;label5.Name" xml:space="preserve">
    <value>label5</value>
  </data>
@@ -535,10 +535,10 @@
    <value>38, 21</value>
  </data>
  <data name="chkAutoCorrectFilenames.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 61</value>
+    <value>12, 55</value>
  </data>
-  <data name="&gt;&gt;numericWriteOffset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  <data name="&gt;&gt;textUDC1EncParams.Parent" xml:space="preserve">
+    <value>tabPage9</value>
  </data>
  <data name="rbWVVeryHigh.ToolTip" xml:space="preserve">
    <value />
@@ -597,9 +597,6 @@
  <data name="label2.Size" type="System.Drawing.Size, System.Drawing">
    <value>54, 13</value>
  </data>
-  <data name="&gt;&gt;lblWriteOffset.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
  <data name="&gt;&gt;lblFLACCompressionLevel.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
@@ -609,6 +606,9 @@
  <data name="chkHDCD24bit.ToolTip" xml:space="preserve">
    <value>When not using lossyWAV, extend to 24 bit for compatibility</value>
  </data>
+  <data name="&gt;&gt;tabPage5.ZOrder" xml:space="preserve">
+    <value>0</value>
+  </data>
  <data name="&gt;&gt;rbWVVeryHigh.Type" xml:space="preserve">
    <value>System.Windows.Forms.RadioButton, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
@@ -675,8 +675,8 @@
  <data name="&gt;&gt;rbAPEnormal.ZOrder" xml:space="preserve">
    <value>4</value>
  </data>
-  <data name="rbAPEextrahigh.Location" type="System.Drawing.Point, System.Drawing">
-    <value>6, 57</value>
+  <data name="&gt;&gt;chkWVStoreMD5.Name" xml:space="preserve">
+    <value>chkWVStoreMD5</value>
  </data>
  <data name="&gt;&gt;chkFillUpCUE.Name" xml:space="preserve">
    <value>chkFillUpCUE</value>
@@ -756,8 +756,8 @@
  <data name="textUDC1EncParams.Location" type="System.Drawing.Point, System.Drawing">
    <value>89, 114</value>
  </data>
-  <data name="&gt;&gt;chkFilenamesANSISafe.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="btnOK.Text" xml:space="preserve">
+    <value>OK</value>
  </data>
  <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
    <value>73, 23</value>
@@ -789,15 +789,9 @@
  <data name="&gt;&gt;chkCreateM3U.Parent" xml:space="preserve">
    <value>grpGeneral</value>
  </data>
-  <data name="&gt;&gt;numericWriteOffset.Parent" xml:space="preserve">
-    <value>grpGeneral</value>
-  </data>
  <data name="&gt;&gt;lblSingleFilenameFormat.Name" xml:space="preserve">
    <value>lblSingleFilenameFormat</value>
  </data>
-  <data name="numericWriteOffset.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
  <data name="label6.Size" type="System.Drawing.Size, System.Drawing">
    <value>62, 13</value>
  </data>
@@ -840,6 +834,12 @@
  <data name="tabPage7.Padding" type="System.Windows.Forms.Padding, System.Windows.Forms">
    <value>3, 3, 3, 3</value>
  </data>
+  <data name="&gt;&gt;txtTrackFilenameFormat.Name" xml:space="preserve">
+    <value>txtTrackFilenameFormat</value>
+  </data>
+  <data name="chkSingleInstance.TabIndex" type="System.Int32, mscorlib">
+    <value>12</value>
+  </data>
  <data name="tabControl1.Location" type="System.Drawing.Point, System.Drawing">
    <value>0, 0</value>
  </data>
@@ -885,9 +885,6 @@
  <data name="&gt;&gt;chkEncodeWhenZeroOffset.Name" xml:space="preserve">
    <value>chkEncodeWhenZeroOffset</value>
  </data>
-  <data name="lblWriteOffset.ToolTip" xml:space="preserve">
-    <value />
-  </data>
  <data name="chkRemoveSpecial.Text" xml:space="preserve">
    <value>Remove special characters except:</value>
  </data>
@@ -916,7 +913,7 @@
    <value>8</value>
  </data>
  <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.ZOrder" xml:space="preserve">
-    <value>4</value>
+    <value>5</value>
  </data>
  <data name="&gt;&gt;grpGeneral.Type" xml:space="preserve">
    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -930,11 +927,8 @@
  <data name="&gt;&gt;grpHDCD.Parent" xml:space="preserve">
    <value>tabPage4</value>
  </data>
-  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
-    <value />
-  </data>
-  <data name="textUDC1Decoder.Location" type="System.Drawing.Point, System.Drawing">
-    <value>89, 33</value>
+  <data name="&gt;&gt;chkFilenamesANSISafe.ZOrder" xml:space="preserve">
+    <value>0</value>
  </data>
  <data name="labelEncodeWhenConfidence.Text" xml:space="preserve">
    <value>with confidence &gt;=</value>
@@ -976,7 +970,7 @@
    <value>label4</value>
  </data>
  <data name="&gt;&gt;chkEmbedLog.ZOrder" xml:space="preserve">
-    <value>7</value>
+    <value>8</value>
  </data>
  <data name="&gt;&gt;rbWVHigh.Parent" xml:space="preserve">
    <value>tabPage6</value>
@@ -1005,6 +999,9 @@
  <data name="rbWVNormal.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 23</value>
  </data>
+  <data name="&gt;&gt;imageList1.Name" xml:space="preserve">
+    <value>imageList1</value>
+  </data>
  <data name="&gt;&gt;tabPage9.Parent" xml:space="preserve">
    <value>tabControl2</value>
  </data>
@@ -1014,6 +1011,9 @@
  <data name="&gt;&gt;chkArFixOffset.Name" xml:space="preserve">
    <value>chkArFixOffset</value>
  </data>
+  <data name="chkSingleInstance.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="rbWVFast.Text" xml:space="preserve">
    <value>Fast</value>
  </data>
@@ -1062,9 +1062,6 @@
  <data name="chkWriteARTagsOnVerify.Size" type="System.Drawing.Size, System.Drawing">
    <value>137, 17</value>
  </data>
-  <data name="chkEmbedLog.Text" xml:space="preserve">
-    <value>Embed log file as a tag</value>
-  </data>
  <data name="&gt;&gt;chkFilenamesANSISafe.Parent" xml:space="preserve">
    <value>grpAudioFilenames</value>
  </data>
@@ -1075,7 +1072,7 @@
    <value>Detect HDCD encoding</value>
  </data>
  <data name="tabPage7.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
  </data>
  <data name="&gt;&gt;chkEmbedLog.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -1110,15 +1107,15 @@
  <data name="&gt;&gt;numericLossyWAVQuality.Type" xml:space="preserve">
    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="label2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="&gt;&gt;groupBox1.ZOrder" xml:space="preserve">
    <value>1</value>
  </data>
  <data name="chkFilenamesANSISafe.Size" type="System.Drawing.Size, System.Drawing">
    <value>128, 17</value>
  </data>
-  <data name="&gt;&gt;lblWriteOffset.ZOrder" xml:space="preserve">
-    <value>11</value>
-  </data>
  <data name="&gt;&gt;textUDC1Encoder.ZOrder" xml:space="preserve">
    <value>5</value>
  </data>
@@ -1174,7 +1171,7 @@
    <value>1</value>
  </data>
  <data name="tabPage8.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
  </data>
  <data name="labelEncodeWhenPercent.Size" type="System.Drawing.Size, System.Drawing">
    <value>121, 13</value>
@@ -1198,7 +1195,7 @@
    <value>520, 249</value>
  </data>
  <data name="&gt;&gt;chkFillUpCUE.ZOrder" xml:space="preserve">
-    <value>6</value>
+    <value>7</value>
  </data>
  <data name="&gt;&gt;numericFLACCompressionLevel.ZOrder" xml:space="preserve">
    <value>0</value>
@@ -1209,14 +1206,14 @@
  <data name="chkEmbedLog.TabIndex" type="System.Int32, mscorlib">
    <value>4</value>
  </data>
-  <data name="&gt;&gt;lblWriteOffset.Name" xml:space="preserve">
-    <value>lblWriteOffset</value>
+  <data name="&gt;&gt;chkSingleInstance.ZOrder" xml:space="preserve">
+    <value>0</value>
  </data>
  <data name="&gt;&gt;txtSingleFilenameFormat.Parent" xml:space="preserve">
    <value>grpAudioFilenames</value>
  </data>
  <data name="tabPage7.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
  </data>
  <data name="chkWriteARTagsOnVerify.Text" xml:space="preserve">
    <value>Write AccurateRip tags</value>
@@ -1254,9 +1251,6 @@
  <data name="&gt;&gt;chkRemoveSpecial.ZOrder" xml:space="preserve">
    <value>3</value>
  </data>
-  <data name="numericWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>133, 20</value>
-  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>45, 13</value>
  </data>
@@ -1275,8 +1269,8 @@
  <data name="&gt;&gt;textUDC1EncParams.Name" xml:space="preserve">
    <value>textUDC1EncParams</value>
  </data>
-  <data name="&gt;&gt;txtTrackFilenameFormat.Name" xml:space="preserve">
-    <value>txtTrackFilenameFormat</value>
+  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <data name="chkCreateCUEFileWhenEmbedded.ToolTip" xml:space="preserve">
    <value />
@@ -1294,7 +1288,7 @@
    <value>0</value>
  </data>
  <data name="tabPage9.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
  </data>
  <data name="rbAPEhigh.Size" type="System.Drawing.Size, System.Drawing">
    <value>46, 17</value>
@@ -1311,9 +1305,6 @@
  <data name="chkCreateM3U.Text" xml:space="preserve">
    <value>Create .m3u playlists</value>
  </data>
-  <data name="numericWriteOffset.TextAlign" type="System.Windows.Forms.HorizontalAlignment, System.Windows.Forms">
-    <value>Right</value>
-  </data>
  <data name="&gt;&gt;textUDC1Decoder.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
@@ -1359,9 +1350,6 @@
  <data name="&gt;&gt;numEncodeWhenConfidence.Parent" xml:space="preserve">
    <value>groupBox1</value>
  </data>
-  <data name="numericWriteOffset.ToolTip" xml:space="preserve">
-    <value />
-  </data>
  <data name="chkArFixOffset.TabIndex" type="System.Int32, mscorlib">
    <value>7</value>
  </data>
@@ -1398,9 +1386,6 @@
  <data name="lblTrackFilenameFormat.TabIndex" type="System.Int32, mscorlib">
    <value>3</value>
  </data>
-  <data name="lblWriteOffset.Text" xml:space="preserve">
-    <value>Write offset (samples):</value>
-  </data>
  <data name="chkUDC1APEv2.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
@@ -1459,7 +1444,7 @@
    <value>tabPage6</value>
  </data>
  <data name="chkOverwriteTags.Location" type="System.Drawing.Point, System.Drawing">
-    <value>30, 198</value>
+    <value>30, 191</value>
  </data>
  <data name="chkWriteArLogOnConvert.ToolTip" xml:space="preserve">
    <value />
@@ -1489,7 +1474,7 @@
    <value />
  </data>
  <data name="chkTruncateExtra4206Samples.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 146</value>
+    <value>12, 140</value>
  </data>
  <data name="&gt;&gt;tabPage3.Parent" xml:space="preserve">
    <value>tabControl1</value>
@@ -1500,9 +1485,6 @@
  <data name="&gt;&gt;btnOK.Name" xml:space="preserve">
    <value>btnOK</value>
  </data>
-  <data name="&gt;&gt;numericWriteOffset.ZOrder" xml:space="preserve">
-    <value>8</value>
-  </data>
  <data name="chkAutoCorrectFilenames.ToolTip" xml:space="preserve">
    <value>Preprocess with filename corrector if unable to locate audio files</value>
  </data>
@@ -1581,6 +1563,9 @@
  <data name="&gt;&gt;toolTip1.Type" xml:space="preserve">
    <value>System.Windows.Forms.ToolTip, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;chkSingleInstance.Parent" xml:space="preserve">
+    <value>grpGeneral</value>
+  </data>
  <data name="rbWVNormal.Text" xml:space="preserve">
    <value>Normal</value>
  </data>
@@ -1593,9 +1578,6 @@
  <data name="chkReducePriority.Text" xml:space="preserve">
    <value>Reduce process priority to Idle</value>
  </data>
-  <data name="numFixWhenConfidence.TabIndex" type="System.Int32, mscorlib">
-    <value>11</value>
-  </data>
  <data name="tabControl1.Size" type="System.Drawing.Size, System.Drawing">
    <value>543, 287</value>
  </data>
@@ -1620,8 +1602,8 @@
  <data name="&gt;&gt;chkFilenamesANSISafe.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="lblWriteOffset.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
+  <data name="numFixWhenConfidence.TabIndex" type="System.Int32, mscorlib">
+    <value>11</value>
  </data>
  <data name="chkExtractLog.Size" type="System.Drawing.Size, System.Drawing">
    <value>95, 17</value>
@@ -1671,6 +1653,9 @@
  <data name="&gt;&gt;lblSingleFilenameFormat.Type" xml:space="preserve">
    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="&gt;&gt;chkSingleInstance.Type" xml:space="preserve">
+    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </data>
  <data name="&gt;&gt;chkHDCDLW16.Parent" xml:space="preserve">
    <value>grpHDCD</value>
  </data>
@@ -1711,7 +1696,7 @@
    <value>CUETools</value>
  </data>
  <data name="tabPage5.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
  </data>
  <data name="&gt;&gt;chkPreserveHTOA.Name" xml:space="preserve">
    <value>chkPreserveHTOA</value>
@@ -1719,6 +1704,9 @@
  <data name="chkKeepOriginalFilenames.ToolTip" xml:space="preserve">
    <value />
  </data>
+  <data name="chkSingleInstance.Location" type="System.Drawing.Point, System.Drawing">
+    <value>12, 21</value>
+  </data>
  <data name="tabControl2.ToolTip" xml:space="preserve">
    <value />
  </data>
@@ -1735,7 +1723,7 @@
    <value>tabPage8</value>
  </data>
  <data name="tabPage9.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
  </data>
  <data name="&gt;&gt;numEncodeWhenConfidence.Name" xml:space="preserve">
    <value>numEncodeWhenConfidence</value>
@@ -1807,7 +1795,7 @@
    <value />
  </data>
  <data name="&gt;&gt;chkTruncateExtra4206Samples.ZOrder" xml:space="preserve">
-    <value>3</value>
+    <value>4</value>
  </data>
  <data name="label5.ToolTip" xml:space="preserve">
    <value />
@@ -1831,13 +1819,13 @@
    <value>4</value>
  </data>
  <data name="&gt;&gt;chkOverwriteTags.ZOrder" xml:space="preserve">
-    <value>0</value>
+    <value>1</value>
  </data>
  <data name="tabPage2.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 22</value>
  </data>
  <data name="chkEmbedLog.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 78</value>
+    <value>12, 72</value>
  </data>
  <data name="&gt;&gt;lblTrackFilenameFormat.ZOrder" xml:space="preserve">
    <value>6</value>
@@ -1861,7 +1849,7 @@
    <value>0</value>
  </data>
  <data name="tabPage5.Size" type="System.Drawing.Size, System.Drawing">
-    <value>512, 223</value>
+    <value>512, 222</value>
  </data>
  <data name="groupBox1.Location" type="System.Drawing.Point, System.Drawing">
    <value>226, 6</value>
@@ -1876,7 +1864,7 @@
    <value>Compression level:</value>
  </data>
  <data name="chkExtractLog.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 95</value>
+    <value>12, 89</value>
  </data>
  <data name="chkFillUpCUE.ToolTip" xml:space="preserve">
    <value />
@@ -1893,8 +1881,8 @@
  <data name="&gt;&gt;chkEncodeWhenZeroOffset.ZOrder" xml:space="preserve">
    <value>0</value>
  </data>
-  <data name="lblWriteOffset.AutoSize" type="System.Boolean, mscorlib">
-    <value>True</value>
+  <data name="chkEmbedLog.Text" xml:space="preserve">
+    <value>Embed log file as a tag</value>
  </data>
  <data name="chkWriteARTagsOnVerify.ToolTip" xml:space="preserve">
    <value>Add ACCURATERIPCOUNT/ACCURATERIPCOUNTALLOFFSETS/ACCURATERIPTOTAL tags to input files. You can set up foobar2000 to show those values, and see if your music was ripped correctly or how popular it is.</value>
@@ -1908,14 +1896,17 @@
  <data name="txtSpecialExceptions.Text" xml:space="preserve">
    <value>-()</value>
  </data>
+  <data name="chkSingleInstance.Size" type="System.Drawing.Size, System.Drawing">
+    <value>156, 17</value>
+  </data>
  <data name="&gt;&gt;numWVExtraMode.Type" xml:space="preserve">
    <value>System.Windows.Forms.NumericUpDown, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
  <data name="chkWVExtraMode.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="&gt;&gt;tabPage5.ZOrder" xml:space="preserve">
-    <value>0</value>
+  <data name="rbAPEextrahigh.Location" type="System.Drawing.Point, System.Drawing">
+    <value>6, 57</value>
  </data>
  <data name="chkUDC1ID3v2.TabIndex" type="System.Int32, mscorlib">
    <value>11</value>
@@ -2001,17 +1992,14 @@
  <data name="labelEncodeWhenConfidence.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
  </data>
-  <data name="&gt;&gt;chkWVStoreMD5.Name" xml:space="preserve">
-    <value>chkWVStoreMD5</value>
-  </data>
  <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.Parent" xml:space="preserve">
    <value>grpGeneral</value>
  </data>
  <data name="tabPage3.Location" type="System.Drawing.Point, System.Drawing">
    <value>4, 22</value>
  </data>
-  <data name="lblWriteOffset.Location" type="System.Drawing.Point, System.Drawing">
-    <value>9, 23</value>
+  <data name="textUDC1Decoder.Location" type="System.Drawing.Point, System.Drawing">
+    <value>89, 33</value>
  </data>
  <data name="tabPage5.Text" xml:space="preserve">
    <value>FLAC</value>
@@ -2100,9 +2088,6 @@
  <data name="chkReplaceSpaces.AutoSize" type="System.Boolean, mscorlib">
    <value>True</value>
  </data>
-  <data name="numericWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>62, 21</value>
-  </data>
  <data name="chkEncodeWhenZeroOffset.Size" type="System.Drawing.Size, System.Drawing">
    <value>100, 17</value>
  </data>
@@ -2142,9 +2127,6 @@
  <data name="&gt;&gt;label6.Name" xml:space="preserve">
    <value>label6</value>
  </data>
-  <data name="&gt;&gt;lblWriteOffset.Parent" xml:space="preserve">
-    <value>grpGeneral</value>
-  </data>
  <data name="label5.Text" xml:space="preserve">
    <value>Encoder</value>
  </data>
@@ -2152,7 +2134,7 @@
    <value>grpAudioFilenames</value>
  </data>
  <data name="chkReducePriority.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 163</value>
+    <value>12, 38</value>
  </data>
  <data name="&gt;&gt;numWVExtraMode.Name" xml:space="preserve">
    <value>numWVExtraMode</value>
@@ -2164,7 +2146,7 @@
    <value>grpGeneral</value>
  </data>
  <data name="&gt;&gt;chkReducePriority.ZOrder" xml:space="preserve">
-    <value>2</value>
+    <value>3</value>
  </data>
  <data name="chkWriteArTagsOnConvert.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 149</value>
@@ -2196,6 +2178,9 @@
  <data name="&gt;&gt;txtSingleFilenameFormat.Type" xml:space="preserve">
    <value>System.Windows.Forms.TextBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="rbWVNormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="&gt;&gt;chkCreateCUEFileWhenEmbedded.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
@@ -2218,7 +2203,7 @@
    <value />
  </data>
  <data name="chkCreateM3U.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 112</value>
+    <value>12, 106</value>
  </data>
  <data name="label4.Size" type="System.Drawing.Size, System.Drawing">
    <value>62, 13</value>
@@ -2247,8 +2232,8 @@
  <data name="lblFLACCompressionLevel.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 8</value>
  </data>
-  <data name="label2.ToolTip" xml:space="preserve">
-    <value />
+  <data name="chkSingleInstance.AutoSize" type="System.Boolean, mscorlib">
+    <value>True</value>
  </data>
  <data name="label4.ToolTip" xml:space="preserve">
    <value />
@@ -2301,9 +2286,6 @@
  <data name="&gt;&gt;grpAudioFilenames.Type" xml:space="preserve">
    <value>System.Windows.Forms.GroupBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;lblSingleFilenameFormat.ZOrder" xml:space="preserve">
-    <value>7</value>
-  </data>
  <data name="labelEncodeWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
    <value>108, 21</value>
  </data>
@@ -2355,6 +2337,9 @@
  <data name="&gt;&gt;chkCreateM3U.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
+  <data name="chkSingleInstance.Text" xml:space="preserve">
+    <value>One instance of application</value>
+  </data>
  <data name="&gt;&gt;tabControl2.Name" xml:space="preserve">
    <value>tabControl2</value>
  </data>
@@ -2370,8 +2355,73 @@
  <data name="rbAPEnormal.ToolTip" xml:space="preserve">
    <value />
  </data>
-  <data name="rbWVNormal.ToolTip" xml:space="preserve">
-    <value />
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm
+        DQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBEAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABEAMAAQEBAAEgBgABEBUAAf8DAAH/AR0BaQEUAf8BHQFpARQB/wMAAf8BHQFpARQB/wEdAWkBFAH/
+        AwAB/wMAAf8BHQEcAR0B/wElASQBJQH/ARQBGAEUAf8DAAH/AwAB/wMAAf8DAAX/AQkBBQEDAf8BCgEG
+        AQMB/wEKAQYBAwH/AQoBBgEDAf8BCwEGAQMB/wEMAQcBBAH/AQoBBgEDAf8BCgEGAQMB/wEKAQYBAwH/
+        AQoBBgEDAf8BCgEGAQMB/wEKAQYBAwH/AQoBBgEDAf8BCQEFAQMF/4AAAVYBWQFWAf8BLQEsAS0B/wE1
+        Ad8BPgH/ATUB3wE+Af8DAAH/ATUB3wE+Af8BNQHfAT4B/wMAAf8DAAH/AYwBjgGMAf8B1gHTAdYB/wHW
+        AdMB1gH/AVYBVQFWAf8DAAH/AwAB/wMAAf8BCgEGAQMB/wHOAY4BXQH/Ac4BjgFdAf8B1AGTAWAB/wHO
+        AY4BXQH/AaYBbwFLAf8BHgETAQwB/wHOAY4BXQH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BCgEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wE1Ad8BPgH/
+        ATUB3wE+Af8DAAH/ATUB3wE+Af8BNQHfAT4B/wMAAf8DAAH/AbUBtgG1Cf8BbwFxAW8B/wMAAf8DAAH/
+        AwAB/wEMAQcBBAH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8B0AGQAV0B/wMAAf8BlQFj
+        AUEB/wHOAY4BXQH/AdIBkAFfAf8B0wGRAV8B/wHTAZEBXwH/AdMBkQFfAf8BzgGOAV0B/wHOAY4BXQH/
+        AQsBBgEDAf+AAAFvAXEBbwH/AS0BLAEtAf8BAAEgAQAB/wEEASwBBAH/AwAB/wEEASwBDAH/AQQBJAEE
+        Af8DAAH/AwAB/wG1AbIBtQn/AW8BbQFvAf8DAAH/AwAB/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFd
+        Af8BzgGOAV0B/wHQAY8BXQH/Ac4BjgFdAf8BGwERAQkB/wEnARoBEAH/Ac4BjgFdAf8BzgGOAV0B/wHO
+        AY4BXQH/Ac4BjgFdAf8B0AGPAV4B/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEs
+        AS0B/wElAa4BLQH/ASUBrgEtAf8DAAH/ASUBrgEtAf8BJQGuAS0B/wMAAf8DAAH/AbUBsgG1Cf8BbwFt
+        AW8B/wMAAf8DAAH/AwAB/wEMAQcBBAH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BzgGO
+        AV0B/wGYAWUBQwH/AwAB/wMAAf8DAAH/ATMBIQEVAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BzgGO
+        AV0B/wELAQYBAwH/gAABbwFxAW8B/wEtASwBLQH/ATUB3wE+Af8BNQHfAT4B/wMAAf8BNQHfAT4B/wE1
+        Ad8BPgH/AwAB/wMAAf8BtQGyAbUJ/wFvAW0BbwH/AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHS
+        AZEBXgH/Ac4BjgFdAf8B0QGQAV4B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/AU0BNAEiAf8BrQFzAU4B/wEs
+        AR0BEwH/AwAB/wHOAY4BXQH/Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABbwFxAW8B/wEtASwBLQH/
+        ATUB3wE+Af8BNQHfAT4B/wMAAf8BNQHfAT4B/wE1Ad8BPgH/AwAB/wMAAf8BrQGuAa0J/wFnAWkBZwH/
+        AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHRAZABXgH/Ac4BjgFdAf8BkQFgAUAB/wHOAY4BXQH/
+        Ac4BjgFdAf8BPQEoARoB/wEEAQIBAAH/Ac4BjgFdAf8BzgGOAV0B/wMAAf8BQQEsARwB/wHOAY4BXQH/
+        Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wEAASQBJQH/AQABLAEtAf8DAAH/AQABLAEt
+        Af8BAAEkASUB/wMAAf8DAAH/Aa0BqgGtCf8BZwFlAWcB/wMAAf8DAAH/AwAB/wEMAQcBBAH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/AwAB/wGrAXIBTAH/Ac4BjgFdAf8BuQF7AVIB/wMAAf8BzgGOAV0B/wHO
+        AY4BXQH/AQQBAgEBAf8BEAEIAQYB/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEs
+        AS0B/wEAAZ4BnAH/AQABngGcAf8DAAH/AQABngGcAf8BAAGeAZwB/wEUASABHRn/ASUBJAElAf8DAAH/
+        AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/ARkBEAEKAf8BzgGOAV0B/wHEAYcBWgH/
+        AwAB/wMAAf8DAAH/AwAB/wGHAVgBOgH/Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABbwFxAW8B/wEt
+        ASwBLQH/AQAD/wEAA/8DAAH/AQAD/wEAA/8DABn/ASUBJAElAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHO
+        AY4BXQH/Ac4BjgFdAf8DAAH/AwAB/wGqAXABSwH/AZkBZgFEAf8DAAH/AwAB/wGiAWoBRwH/Ac4BjgFd
+        Af8BzgGOAV0B/wHOAY4BXQH/Ac4BjgFdAf8BCwEGAQMB/4AAAW8BcQFvAf8BLQEsAS0B/wEAA/8BAAP/
+        AwAB/wEAA/8BAAP/AwAB/wFWAVEBTgH/Ad4B2wHeCf8BtQGyAbUB/wF3AXkBdwH/AQQBCAEEAf8DAAH/
+        AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/AZ4BaAFGAf8DAAH/AV0BPgEqAf8BEwEMAQcB/wFhAUEBLAH/
+        ARsBEgEKAf8BJwEaAREB/wFBASsBHAH/Ac4BjgFdAf8B0QGQAV4B/wHOAY4BXQH/Ac4BjgFdAf8BCwEG
+        AQMB/4AAAW8BcQFvAf8BLQEsAS0B/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BlAGWAZQJ/wG1
+        AbYBtQH/AwAB/wMAAf8DAAH/AQwBBwEEAf8BzgGOAV0B/wHOAY4BXQH/AXMBTgE1Af8DAAH/Ac4BjgFd
+        Af8DAAH/AwAB/wFTATgBJgH/Aa4BdQFOAf8DAAH/Ac4BjgFdAf8BzgGOAV0B/wHTAZEBXwH/AdQBkwFg
+        Af8BCwEGAQMB/4AAAZwBmgGcAf8BLQEsAS0B/wIAAaUB/wIAAaUB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+        AS0BLAEtEf8BvQG6Ab0B/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFdAf8BQQErAR0B/wMAAf8BzgGO
+        AV0B/wFsAUkBMAH/AwAB/wGDAVYBOgH/Ac4BjgFdAf8DAAH/ATIBIAEWAf8BzgGOAV0B/wHOAY4BXQH/
+        AdQBkwFgAf8BCwEGAQMB/4AAAZQBkgGUAf8BLQEsAS0B/wIAAv8CAAL/AwAB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AZwBmgGcDf8BlAGWAZQB/wMAAf8BDAEHAQQB/wHOAY4BXQH/Ac4BjgFdAf8BAgIAAf8BJAEY
+        AQ8B/wHOAY4BXQH/Ac4BjgFdAf8DAAH/AZ8BaQFHAf8BzgGOAV0B/wGLAVsBPQH/AwAB/wHOAY4BXQH/
+        Ac4BjgFdAf8BzgGOAV0B/wELAQYBAwH/gAABpQGmAaUB/wGUAZIBlAH/AgABpQH/AgABtQH/AS0BLAEt
+        Af8BLQEsAS0B/wEtASwBLQH/AS0BLAEtAf8BLQEsAS0B/wEtASwBLQH/AS0BMAEtAf8BTgFRAU4B/wGt
+        AaoBrQH/Aa0BqgGtAf8BRgFJAUYB/wMAAf8BCgEGAQMB/wHOAY4BXQH/Ac4BjgFdAf8BcwFNATQB/wGl
+        AW4BSQH/Ac4BjgFdAf8BzgGOAV0B/wGYAWUBQwH/Ac4BjgFdAf8BzgGOAV0B/wHOAY4BXQH/AW4BSwEy
+        Af8BrgFzAU4B/wHOAY4BXQH/Ac4BjgFdAf8BCgEGAQMB/4AAAd4B2wHeAf8BpQGmAaUB/wGlAaYBpQH/
+        AXcBdQF3Af8BbwFxAW8B/wFvAXEBbwH/AW8BcQFvAf8BbwFxAW8B/wFvAXEBbwH/AW8BcQFvAf8BbwFx
+        AW8B/wFvAXEBbwH/AW8BcQFvAf8BLQEsAS0B/wEtASwBLQH/AwAF/wEKAQYBAwH/AQsBBwEDAf8BDAEH
+        AQQB/wEMAQcBAwH/AQsBBwEDAf8BCwEHAQMB/wEMAQcBAwH/AQwBBwEDAf8BCwEHAQMB/wELAQcBAwH/
+        AQwBBwEEAf8BDAEHAQMB/wELAQcBAwH/AQoBBgEDBf+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
+        AQABAQUAAYAXAAP/lwAL
+</value>
+  </data>
+  <data name="tabPage6.ImageKey" xml:space="preserve">
+    <value>wv</value>
  </data>
  <data name="&gt;&gt;chkRemoveSpecial.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
@@ -2398,7 +2448,7 @@
    <value>textUDC1Extension</value>
  </data>
  <data name="&gt;&gt;chkExtractLog.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>2</value>
  </data>
  <data name="tabPage2.ToolTip" xml:space="preserve">
    <value />
@@ -2499,8 +2549,8 @@
  <data name="&gt;&gt;chkTruncateExtra4206Samples.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="&gt;&gt;textUDC1EncParams.Parent" xml:space="preserve">
-    <value>tabPage9</value>
+  <data name="tabPage5.ImageKey" xml:space="preserve">
+    <value>flac</value>
  </data>
  <data name="btnCancel.ToolTip" xml:space="preserve">
    <value />
@@ -2512,13 +2562,13 @@
    <value />
  </data>
  <data name="chkCreateCUEFileWhenEmbedded.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 129</value>
+    <value>12, 123</value>
  </data>
  <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
    <value>5</value>
  </data>
  <data name="&gt;&gt;chkCreateM3U.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>6</value>
  </data>
  <data name="rbAPEinsane.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 74</value>
@@ -2539,7 +2589,7 @@
    <value>1</value>
  </data>
  <data name="tabPage8.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 22</value>
+    <value>4, 23</value>
  </data>
  <data name="&gt;&gt;tabControl1.Name" xml:space="preserve">
    <value>tabControl1</value>
@@ -2596,7 +2646,7 @@
    <value>Yes</value>
  </data>
  <data name="chkPreserveHTOA.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 44</value>
+    <value>12, 157</value>
  </data>
  <data name="&gt;&gt;chkUDC1ID3v2.ZOrder" xml:space="preserve">
    <value>0</value>
@@ -2674,7 +2724,7 @@
    <value>chkWriteARLogOnVerify</value>
  </data>
  <data name="chkFillUpCUE.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 181</value>
+    <value>12, 174</value>
  </data>
  <data name="&gt;&gt;label1.Parent" xml:space="preserve">
    <value>tabPage8</value>
@@ -2685,8 +2735,8 @@
  <data name="&gt;&gt;chkWVExtraMode.Type" xml:space="preserve">
    <value>System.Windows.Forms.CheckBox, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </data>
-  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>118, 13</value>
+  <data name="&gt;&gt;lblSingleFilenameFormat.ZOrder" xml:space="preserve">
+    <value>7</value>
  </data>
  <data name="&gt;&gt;tabPage6.Name" xml:space="preserve">
    <value>tabPage6</value>
@@ -2736,4 +2786,7 @@
  <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>True</value>
  </metadata>
+  <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>114, 17</value>
+  </metadata>
 </root>
--- a/CUETools/frmSettings.ru-RU.resx
+++ b/CUETools/frmSettings.ru-RU.resx
@@ -120,16 +120,46 @@
  <data name="btnCancel.Text" xml:space="preserve">
    <value>Отмена</value>
  </data>
-  <data name="grpGeneral.Text" xml:space="preserve">
-    <value>Общие</value>
+  <data name="btnCancel.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <assembly alias="System.Drawing" name="System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="chkSingleInstance.Size" type="System.Drawing.Size, System.Drawing">
+    <value>182, 17</value>
+  </data>
+  <data name="chkSingleInstance.Text" xml:space="preserve">
+    <value>Только одно окно приложения</value>
+  </data>
+  <data name="chkSingleInstance.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkOverwriteTags.Size" type="System.Drawing.Size, System.Drawing">
+    <value>186, 17</value>
+  </data>
+  <data name="chkOverwriteTags.Text" xml:space="preserve">
+    <value>Игнорируя информацию из .cue</value>
+  </data>
+  <data name="chkOverwriteTags.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkExtractLog.Size" type="System.Drawing.Size, System.Drawing">
+    <value>127, 17</value>
+  </data>
+  <data name="chkExtractLog.Text" xml:space="preserve">
+    <value>Извлечь .log в файл</value>
+  </data>
+  <data name="chkExtractLog.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkReducePriority.Size" type="System.Drawing.Size, System.Drawing">
    <value>180, 17</value>
  </data>
  <data name="chkReducePriority.Text" xml:space="preserve">
    <value>Понизить приоритет процесса</value>
  </data>
+  <data name="chkReducePriority.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkTruncateExtra4206Samples.Size" type="System.Drawing.Size, System.Drawing">
    <value>202, 17</value>
  </data>
@@ -145,18 +175,27 @@
  <data name="chkCreateCUEFileWhenEmbedded.Text" xml:space="preserve">
    <value>Создавать .cue даже при встраивании</value>
  </data>
+  <data name="chkCreateCUEFileWhenEmbedded.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkCreateM3U.Size" type="System.Drawing.Size, System.Drawing">
    <value>166, 17</value>
  </data>
  <data name="chkCreateM3U.Text" xml:space="preserve">
    <value>Создавать плейлисты .m3u</value>
  </data>
+  <data name="chkCreateM3U.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkFillUpCUE.Size" type="System.Drawing.Size, System.Drawing">
    <value>221, 17</value>
  </data>
  <data name="chkFillUpCUE.Text" xml:space="preserve">
    <value>Пополнить .cue информацией из тэгов</value>
  </data>
+  <data name="chkFillUpCUE.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkEmbedLog.Size" type="System.Drawing.Size, System.Drawing">
    <value>156, 17</value>
  </data>
@@ -181,11 +220,17 @@
  <data name="chkPreserveHTOA.Text" xml:space="preserve">
    <value>Сохранять HTOA при разбивке на треки</value>
  </data>
-  <data name="lblWriteOffset.Size" type="System.Drawing.Size, System.Drawing">
-    <value>114, 13</value>
+  <data name="chkPreserveHTOA.ToolTip" xml:space="preserve">
+    <value />
  </data>
-  <data name="lblWriteOffset.Text" xml:space="preserve">
-    <value>Смещение (сэмплов):</value>
+  <data name="grpGeneral.Text" xml:space="preserve">
+    <value>Общие</value>
+  </data>
+  <data name="grpGeneral.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericFLACCompressionLevel.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <data name="lblFLACCompressionLevel.Size" type="System.Drawing.Size, System.Drawing">
    <value>94, 13</value>
@@ -193,50 +238,77 @@
  <data name="lblFLACCompressionLevel.Text" xml:space="preserve">
    <value>Уровень сжатия:</value>
  </data>
+  <data name="lblFLACCompressionLevel.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkFLACVerify.Size" type="System.Drawing.Size, System.Drawing">
    <value>94, 17</value>
  </data>
  <data name="chkFLACVerify.Text" xml:space="preserve">
    <value>Верификация</value>
  </data>
+  <data name="chkFLACVerify.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnOK.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkWVStoreMD5.Size" type="System.Drawing.Size, System.Drawing">
    <value>119, 17</value>
  </data>
  <data name="chkWVStoreMD5.Text" xml:space="preserve">
    <value>MD5-хеширование</value>
  </data>
+  <data name="chkWVStoreMD5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numWVExtraMode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkWVExtraMode.Size" type="System.Drawing.Size, System.Drawing">
    <value>89, 17</value>
  </data>
  <data name="chkWVExtraMode.Text" xml:space="preserve">
    <value>Доп. режим:</value>
  </data>
+  <data name="chkWVExtraMode.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="rbWVVeryHigh.Size" type="System.Drawing.Size, System.Drawing">
    <value>103, 17</value>
  </data>
  <data name="rbWVVeryHigh.Text" xml:space="preserve">
    <value>Очень высокий</value>
  </data>
+  <data name="rbWVVeryHigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="rbWVHigh.Size" type="System.Drawing.Size, System.Drawing">
    <value>68, 17</value>
  </data>
  <data name="rbWVHigh.Text" xml:space="preserve">
    <value>Высокий</value>
  </data>
+  <data name="rbWVHigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="rbWVNormal.Size" type="System.Drawing.Size, System.Drawing">
    <value>69, 17</value>
  </data>
  <data name="rbWVNormal.Text" xml:space="preserve">
    <value>Средний</value>
  </data>
+  <data name="rbWVNormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="rbWVFast.Size" type="System.Drawing.Size, System.Drawing">
    <value>70, 17</value>
  </data>
  <data name="rbWVFast.Text" xml:space="preserve">
    <value>Быстрый</value>
  </data>
-  <data name="groupBox1.Text" xml:space="preserve">
-    <value>Проверить и записать</value>
+  <data name="rbWVFast.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <data name="chkEncodeWhenZeroOffset.Location" type="System.Drawing.Point, System.Drawing">
    <value>150, 77</value>
@@ -247,6 +319,9 @@
  <data name="chkEncodeWhenZeroOffset.Text" xml:space="preserve">
    <value>и нулевым смещением</value>
  </data>
+  <data name="chkEncodeWhenZeroOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkArFixOffset.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 100</value>
  </data>
@@ -256,6 +331,9 @@
  <data name="chkArFixOffset.Text" xml:space="preserve">
    <value>Исправлять смещение если</value>
  </data>
+  <data name="chkArFixOffset.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkWriteArLogOnConvert.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 181</value>
  </data>
@@ -265,6 +343,9 @@
  <data name="chkWriteArLogOnConvert.Text" xml:space="preserve">
    <value>Записывать отчет AccurateRip</value>
  </data>
+  <data name="chkWriteArLogOnConvert.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkWriteArTagsOnConvert.Location" type="System.Drawing.Point, System.Drawing">
    <value>6, 164</value>
  </data>
@@ -286,9 +367,15 @@
  <data name="labelEncodeWhenPercent.Text" xml:space="preserve">
    <value>% проверенных треков &gt;=</value>
  </data>
+  <data name="labelEncodeWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="numEncodeWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
    <value>250, 35</value>
  </data>
+  <data name="numEncodeWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="labelEncodeWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
    <value>125, 58</value>
  </data>
@@ -298,15 +385,24 @@
  <data name="labelEncodeWhenConfidence.Text" xml:space="preserve">
    <value>с достоверностью &gt;=</value>
  </data>
+  <data name="labelEncodeWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="numEncodeWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
    <value>250, 56</value>
  </data>
+  <data name="numEncodeWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkArNoUnverifiedAudio.Size" type="System.Drawing.Size, System.Drawing">
    <value>176, 17</value>
  </data>
  <data name="chkArNoUnverifiedAudio.Text" xml:space="preserve">
    <value>Конвертировать только если</value>
  </data>
+  <data name="chkArNoUnverifiedAudio.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
  <data name="labelFixWhenConfidence.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Right</value>
@@ -324,9 +420,15 @@
  <data name="labelFixWhenConfidence.Text" xml:space="preserve">
    <value>с достоверностью &gt;=</value>
  </data>
+  <data name="labelFixWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="numFixWhenConfidence.Location" type="System.Drawing.Point, System.Drawing">
    <value>251, 137</value>
  </data>
+  <data name="numFixWhenConfidence.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="labelFixWhenPercent.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
    <value>Top, Right</value>
  </data>
@@ -342,9 +444,21 @@
  <data name="labelFixWhenPercent.Text" xml:space="preserve">
    <value>% проверенных треков &gt;=</value>
  </data>
+  <data name="labelFixWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="numFixWhenPercent.Location" type="System.Drawing.Point, System.Drawing">
    <value>250, 116</value>
  </data>
+  <data name="numFixWhenPercent.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="groupBox1.Text" xml:space="preserve">
+    <value>Проверить и записать</value>
+  </data>
+  <data name="groupBox1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkFilenamesANSISafe.Size" type="System.Drawing.Size, System.Drawing">
    <value>207, 17</value>
  </data>
@@ -402,27 +516,39 @@
  <data name="chkHDCDLW16.ToolTip" xml:space="preserve">
    <value>При конвертации в lossyWAV, обрезать до 16 бит</value>
  </data>
-  <data name="grpAudioFilenames.Text" xml:space="preserve">
-    <value>Имена аудиофайлов</value>
-  </data>
  <data name="chkKeepOriginalFilenames.Size" type="System.Drawing.Size, System.Drawing">
    <value>157, 17</value>
  </data>
  <data name="chkKeepOriginalFilenames.Text" xml:space="preserve">
    <value>Сохранять оригинальные</value>
  </data>
+  <data name="chkKeepOriginalFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtSpecialExceptions.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkRemoveSpecial.Size" type="System.Drawing.Size, System.Drawing">
    <value>223, 17</value>
  </data>
  <data name="chkRemoveSpecial.Text" xml:space="preserve">
    <value>Удалять специальные символы кроме:</value>
  </data>
+  <data name="chkRemoveSpecial.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkReplaceSpaces.Size" type="System.Drawing.Size, System.Drawing">
    <value>209, 17</value>
  </data>
  <data name="chkReplaceSpaces.Text" xml:space="preserve">
    <value>Заменять пробелы подчеркиванями</value>
  </data>
+  <data name="chkReplaceSpaces.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtTrackFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="lblTrackFilenameFormat.Location" type="System.Drawing.Point, System.Drawing">
    <value>10, 75</value>
  </data>
@@ -432,14 +558,44 @@
  <data name="lblTrackFilenameFormat.Text" xml:space="preserve">
    <value>Трек:</value>
  </data>
+  <data name="lblTrackFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="lblSingleFilenameFormat.Size" type="System.Drawing.Size, System.Drawing">
    <value>75, 13</value>
  </data>
  <data name="lblSingleFilenameFormat.Text" xml:space="preserve">
    <value>Образ диска:</value>
  </data>
-  <data name="groupBox3.Text" xml:space="preserve">
-    <value>При проверке</value>
+  <data name="lblSingleFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="txtSingleFilenameFormat.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="grpAudioFilenames.Text" xml:space="preserve">
+    <value>Имена аудиофайлов</value>
+  </data>
+  <data name="grpAudioFilenames.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEinsane.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEextrahigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEhigh.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEnormal.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="rbAPEfast.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage1.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <data name="chkWriteARLogOnVerify.Location" type="System.Drawing.Point, System.Drawing">
    <value>5, 181</value>
@@ -450,8 +606,26 @@
  <data name="chkWriteARLogOnVerify.Text" xml:space="preserve">
    <value>Записывать отчет AccurateRip</value>
  </data>
-  <data name="tabPage3.Text" xml:space="preserve">
-    <value>Форматы</value>
+  <data name="chkWriteARLogOnVerify.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="groupBox3.Text" xml:space="preserve">
+    <value>При проверке</value>
+  </data>
+  <data name="groupBox3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage6.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage7.ToolTip" xml:space="preserve">
+    <value />
  </data>
  <data name="label1.Size" type="System.Drawing.Size, System.Drawing">
    <value>59, 13</value>
@@ -459,16 +633,153 @@
  <data name="label1.Text" xml:space="preserve">
    <value>Качество:</value>
  </data>
+  <data name="label1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="numericLossyWAVQuality.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage8.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkUDC1ID3v2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="chkUDC1APEv2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label6.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label5.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1EncParams.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Encoder.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Params.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Decoder.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="textUDC1Extension.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label4.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="label2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage9.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj0yLjAuMC4w
+        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
+        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABm
+        DQAAAk1TRnQBSQFMAgEBAgEAAQQBAAEEAQABEAEAARABAAT/ASEBAAj/AUIBTQE2BwABNgMAASgDAAFA
+        AwABEAMAAQEBAAEgBgABEBUAAf8DAAH/ARwBaAETAf8BHAFoARMB/wMAAf8BHAFoARMB/wEcAWgBEwH/
+        AwAB/wMAAf8BHAEbARwB/wEkASMBJAH/ARMBFwETAf8DAAH/AwAB/wMAAf8DAAX/AQgBBAECAf8BCQEF
+        AQIB/wEJAQUBAgH/AQkBBQECAf8BCgEFAQIB/wELAQYBAwH/AQkBBQECAf8BCQEFAQIB/wEJAQUBAgH/
+        AQkBBQECAf8BCQEFAQIB/wEJAQUBAgH/AQkBBQECAf8BCAEEAQIF/4AAAVUBWAFVAf8BLAErASwB/wE0
+        Ad8BPQH/ATQB3wE9Af8DAAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8DAAH/AYwBjgGMAf8B1gHTAdYB/wHW
+        AdMB1gH/AVUBVAFVAf8DAAH/AwAB/wMAAf8BCQEFAQIB/wHOAY4BXAH/Ac4BjgFcAf8B1AGTAV8B/wHO
+        AY4BXAH/AaYBbgFKAf8BHQESAQsB/wHOAY4BXAH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BCQEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wE0Ad8BPQH/
+        ATQB3wE9Af8DAAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8DAAH/AbUBtgG1Cf8BbgFwAW4B/wMAAf8DAAH/
+        AwAB/wELAQYBAwH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8B0AGQAVwB/wMAAf8BlQFi
+        AUAB/wHOAY4BXAH/AdIBkAFeAf8B0wGRAV4B/wHTAZEBXgH/AdMBkQFeAf8BzgGOAVwB/wHOAY4BXAH/
+        AQoBBQECAf+AAAFuAXABbgH/ASwBKwEsAf8BAAEfAQAB/wEDASsBAwH/AwAB/wEDASsBCwH/AQMBIwED
+        Af8DAAH/AwAB/wG1AbIBtQn/AW4BbAFuAf8DAAH/AwAB/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFc
+        Af8BzgGOAVwB/wHQAY8BXAH/Ac4BjgFcAf8BGgEQAQgB/wEmARkBDwH/Ac4BjgFcAf8BzgGOAVwB/wHO
+        AY4BXAH/Ac4BjgFcAf8B0AGPAV0B/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAEr
+        ASwB/wEkAa4BLAH/ASQBrgEsAf8DAAH/ASQBrgEsAf8BJAGuASwB/wMAAf8DAAH/AbUBsgG1Cf8BbgFs
+        AW4B/wMAAf8DAAH/AwAB/wELAQYBAwH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BzgGO
+        AVwB/wGYAWQBQgH/AwAB/wMAAf8DAAH/ATIBIAEUAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BzgGO
+        AVwB/wEKAQUBAgH/gAABbgFwAW4B/wEsASsBLAH/ATQB3wE9Af8BNAHfAT0B/wMAAf8BNAHfAT0B/wE0
+        Ad8BPQH/AwAB/wMAAf8BtQGyAbUJ/wFuAWwBbgH/AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHS
+        AZEBXQH/Ac4BjgFcAf8B0QGQAV0B/wHOAY4BXAH/Ac4BjgFcAf8DAAH/AUwBMwEhAf8BrQFyAU0B/wEr
+        ARwBEgH/AwAB/wHOAY4BXAH/Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABbgFwAW4B/wEsASsBLAH/
+        ATQB3wE9Af8BNAHfAT0B/wMAAf8BNAHfAT0B/wE0Ad8BPQH/AwAB/wMAAf8BrQGuAa0J/wFmAWgBZgH/
+        AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHRAZABXQH/Ac4BjgFcAf8BkQFfAT8B/wHOAY4BXAH/
+        Ac4BjgFcAf8BPAEnARkB/wEDAQEBAAH/Ac4BjgFcAf8BzgGOAVwB/wMAAf8BQAErARsB/wHOAY4BXAH/
+        Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wEAASMBJAH/AQABKwEsAf8DAAH/AQABKwEs
+        Af8BAAEjASQB/wMAAf8DAAH/Aa0BqgGtCf8BZgFkAWYB/wMAAf8DAAH/AwAB/wELAQYBAwH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/AwAB/wGrAXEBSwH/Ac4BjgFcAf8BuQF6AVEB/wMAAf8BzgGOAVwB/wHO
+        AY4BXAH/AQMBAQEAAf8BDwEHAQUB/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAEr
+        ASwB/wEAAZ4BnAH/AQABngGcAf8DAAH/AQABngGcAf8BAAGeAZwB/wETAR8BHBn/ASQBIwEkAf8DAAH/
+        AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8DAAH/ARgBDwEJAf8BzgGOAVwB/wHEAYcBWQH/
+        AwAB/wMAAf8DAAH/AwAB/wGHAVcBOQH/Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABbgFwAW4B/wEs
+        ASsBLAH/AQAD/wEAA/8DAAH/AQAD/wEAA/8DABn/ASQBIwEkAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHO
+        AY4BXAH/Ac4BjgFcAf8DAAH/AwAB/wGqAW8BSgH/AZkBZQFDAf8DAAH/AwAB/wGiAWkBRgH/Ac4BjgFc
+        Af8BzgGOAVwB/wHOAY4BXAH/Ac4BjgFcAf8BCgEFAQIB/4AAAW4BcAFuAf8BLAErASwB/wEAA/8BAAP/
+        AwAB/wEAA/8BAAP/AwAB/wFVAVABTQH/Ad4B2wHeCf8BtQGyAbUB/wF2AXgBdgH/AQMBBwEDAf8DAAH/
+        AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/AZ4BZwFFAf8DAAH/AVwBPQEpAf8BEgELAQYB/wFgAUABKwH/
+        ARoBEQEJAf8BJgEZARAB/wFAASoBGwH/Ac4BjgFcAf8B0QGQAV0B/wHOAY4BXAH/Ac4BjgFcAf8BCgEF
+        AQIB/4AAAW4BcAFuAf8BLAErASwB/wMAAf8DAAH/AwAB/wMAAf8DAAH/AwAB/wMAAf8BlAGWAZQJ/wG1
+        AbYBtQH/AwAB/wMAAf8DAAH/AQsBBgEDAf8BzgGOAVwB/wHOAY4BXAH/AXIBTQE0Af8DAAH/Ac4BjgFc
+        Af8DAAH/AwAB/wFSATcBJQH/Aa4BdAFNAf8DAAH/Ac4BjgFcAf8BzgGOAVwB/wHTAZEBXgH/AdQBkwFf
+        Af8BCgEFAQIB/4AAAZwBmgGcAf8BLAErASwB/wIAAaUB/wIAAaUB/wMAAf8DAAH/AwAB/wMAAf8DAAH/
+        ASwBKwEsEf8BvQG6Ab0B/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFcAf8BQAEqARwB/wMAAf8BzgGO
+        AVwB/wFrAUgBLwH/AwAB/wGDAVUBOQH/Ac4BjgFcAf8DAAH/ATEBHwEVAf8BzgGOAVwB/wHOAY4BXAH/
+        AdQBkwFfAf8BCgEFAQIB/4AAAZQBkgGUAf8BLAErASwB/wIAAv8CAAL/AwAB/wMAAf8DAAH/AwAB/wMA
+        Af8DAAH/AZwBmgGcDf8BlAGWAZQB/wMAAf8BCwEGAQMB/wHOAY4BXAH/Ac4BjgFcAf8BAQIAAf8BIwEX
+        AQ4B/wHOAY4BXAH/Ac4BjgFcAf8DAAH/AZ8BaAFGAf8BzgGOAVwB/wGLAVoBPAH/AwAB/wHOAY4BXAH/
+        Ac4BjgFcAf8BzgGOAVwB/wEKAQUBAgH/gAABpQGmAaUB/wGUAZIBlAH/AgABpQH/AgABtQH/ASwBKwEs
+        Af8BLAErASwB/wEsASsBLAH/ASwBKwEsAf8BLAErASwB/wEsASsBLAH/ASwBLwEsAf8BTQFQAU0B/wGt
+        AaoBrQH/Aa0BqgGtAf8BRQFIAUUB/wMAAf8BCQEFAQIB/wHOAY4BXAH/Ac4BjgFcAf8BcgFMATMB/wGl
+        AW0BSAH/Ac4BjgFcAf8BzgGOAVwB/wGYAWQBQgH/Ac4BjgFcAf8BzgGOAVwB/wHOAY4BXAH/AW0BSgEx
+        Af8BrgFyAU0B/wHOAY4BXAH/Ac4BjgFcAf8BCQEFAQIB/4AAAd4B2wHeAf8BpQGmAaUB/wGlAaYBpQH/
+        AXYBdAF2Af8BbgFwAW4B/wFuAXABbgH/AW4BcAFuAf8BbgFwAW4B/wFuAXABbgH/AW4BcAFuAf8BbgFw
+        AW4B/wFuAXABbgH/AW4BcAFuAf8BLAErASwB/wEsASsBLAH/AwAF/wEJAQUBAgH/AQoBBgECAf8BCwEG
+        AQMB/wELAQYBAgH/AQoBBgECAf8BCgEGAQIB/wELAQYBAgH/AQsBBgECAf8BCgEGAQIB/wEKAQYBAgH/
+        AQsBBgEDAf8BCwEGAQIB/wEKAQYBAgH/AQkBBQECBf+AAAFCAU0BPgcAAT4DAAEoAwABQAMAARADAAEB
+        AQABAQUAAYAXAAP/gQAL
+</value>
+  </data>
+  <data name="tabControl2.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage3.Text" xml:space="preserve">
+    <value>Форматы</value>
+  </data>
+  <data name="tabPage3.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="grpHDCD.Text" xml:space="preserve">
    <value>Параметры</value>
  </data>
+  <data name="grpHDCD.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="chkHDCDDetect.Size" type="System.Drawing.Size, System.Drawing">
    <value>120, 17</value>
  </data>
  <data name="chkHDCDDetect.Text" xml:space="preserve">
    <value>Определять HDCD</value>
  </data>
+  <data name="chkHDCDDetect.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabPage4.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <data name="tabControl1.ToolTip" xml:space="preserve">
+    <value />
+  </data>
  <data name="$this.Text" xml:space="preserve">
    <value>Продвинутые настройки</value>
  </data>
+  <data name="$this.ToolTip" xml:space="preserve">
+    <value />
+  </data>
 </root>
--- a/Freedb/CDEntry.cs
+++ b/Freedb/CDEntry.cs
@@ -26,7 +26,7 @@ namespace Freedb
 	/// <summary>
 	/// Summary description for CDEntry.
 	/// </summary>
-	public class CDEntry
+	public class CDEntry : ICloneable
 	{


@@ -196,6 +196,24 @@ namespace Freedb
 			}
 		}

+		public CDEntry(CDEntry src)
+		{
+			m_Discid = src.m_Discid;
+			m_Artist = src.m_Artist;
+			m_Title = src.m_Title;
+			m_Year = src.m_Year;
+			m_Genre = src.m_Genre;
+			m_ExtendedData = src.m_ExtendedData;
+			m_PlayOrder = src.m_PlayOrder;
+			m_Tracks = new TrackCollection();
+			foreach (Track tr in src.m_Tracks)
+				m_Tracks.Add(new Track(tr));
+		}
+
+		public object Clone()
+		{
+			return new CDEntry(this);
+		}

 		private bool Parse(StringCollection data)
 		{
--- a/Freedb/Track.cs
+++ b/Freedb/Track.cs
@@ -23,7 +23,7 @@ namespace Freedb
 	/// <summary>
 	/// Summary description for Track.
 	/// </summary>
-	public class Track
+	public class Track : ICloneable
 	{

 		private string m_Title;
@@ -108,8 +108,21 @@ namespace Freedb
 			m_Title = title;
 			m_ExtendedData = extendedData;
 		}
-	
-	
-	
+
+		/// <summary>
+		/// Create an instance of a Track passing in a track
+		/// </summary>
+		/// <param name="title"></param>
+		public Track(Track src)
+		{
+			m_Title = src.m_Title;
+			m_ExtendedData = src.m_ExtendedData;
+			m_FrameOffset = src.m_FrameOffset;
+		}
+
+		public object Clone()
+		{
+			return new Track(this);
+		}
 	}
 }