diff --git a/AaxDecrypter/AaxcDownloadConverter.cs b/AaxDecrypter/AaxcDownloadConverter.cs
index cd3d8ff1..f75f2a39 100644
--- a/AaxDecrypter/AaxcDownloadConverter.cs
+++ b/AaxDecrypter/AaxcDownloadConverter.cs
@@ -175,34 +175,41 @@ namespace AaxDecrypter
 
         public bool Step3_DownloadAndCombine()
         {
-            DecryptProgressUpdate?.Invoke(this, int.MaxValue);
+            OutputFormat format = OutputFormat.Mp4a;
+
+            DecryptProgressUpdate?.Invoke(this, 0);
 
             if (File.Exists(outputFileName))
                 FileExt.SafeDelete(outputFileName);
 
             FileStream outFile = File.OpenWrite(outputFileName);
 
-            aaxFile.DecryptionProgressUpdate += AaxFile_DecryptionProgressUpdate;
-            using var decryptedBook = aaxFile.DecryptAaxc(outFile, downloadLicense.AudibleKey, downloadLicense.AudibleIV, downloadLicense.ChapterInfo);
-            aaxFile.DecryptionProgressUpdate -= AaxFile_DecryptionProgressUpdate;
+            aaxFile.ConversionProgressUpdate += AaxFile_ConversionProgressUpdate;
+            var decryptionResult = aaxFile.DecryptAaxc(outFile, downloadLicense.AudibleKey, downloadLicense.AudibleIV, format, downloadLicense.ChapterInfo);
+            aaxFile.ConversionProgressUpdate -= AaxFile_ConversionProgressUpdate;
 
             downloadLicense.ChapterInfo = aaxFile.Chapters;
 
-            if (coverArt is not null)
+            if (decryptionResult == ConversionResult.NoErrorsDetected
+                && coverArt is not null
+                && format == OutputFormat.Mp4a)
             {
-                decryptedBook?.AppleTags?.SetCoverArt(coverArt);
-                decryptedBook?.Save();
+                //This handles a special case where the aaxc file doesn't contain cover art and
+                //Libation downloaded it instead (Animal Farm). Currently only works for Mp4a files.
+                using var decryptedBook = new Mp4File(outputFileName, FileAccess.ReadWrite);
+                decryptedBook.AppleTags?.SetCoverArt(coverArt);
+                decryptedBook.Save();
+                decryptedBook.Close();
             }
 
-            decryptedBook?.Close();
             nfsPersister.Dispose();
 
             DecryptProgressUpdate?.Invoke(this, 0);
 
-            return aaxFile is not null && !isCanceled;
+            return decryptionResult == ConversionResult.NoErrorsDetected && !isCanceled;
         }
 
-        private void AaxFile_DecryptionProgressUpdate(object sender, DecryptionProgressEventArgs e)
+        private void AaxFile_ConversionProgressUpdate(object sender, ConversionProgressEventArgs e)
         {
             var duration = aaxFile.Duration;
             double remainingSecsToProcess = (duration - e.ProcessPosition).TotalSeconds;
diff --git a/LibationWinForms/BookLiberation/DecryptForm.cs b/LibationWinForms/BookLiberation/DecryptForm.cs
index 6788a774..3dcf7360 100644
--- a/LibationWinForms/BookLiberation/DecryptForm.cs
+++ b/LibationWinForms/BookLiberation/DecryptForm.cs
@@ -64,14 +64,8 @@ namespace LibationWinForms.BookLiberation
             if (percentage == 0)
                 remainingTimeLbl.UIThread(() => remainingTimeLbl.Text = "ETA:\r\n0 sec");
 
-            if (percentage == int.MaxValue)
-                progressBar1.UIThread(() => progressBar1.Style = ProgressBarStyle.Marquee);
             else
-                progressBar1.UIThread(() =>
-                {
-                    progressBar1.Value = percentage;
-                    progressBar1.Style = ProgressBarStyle.Blocks;
-                });
+                progressBar1.UIThread(() => progressBar1.Value = percentage);
         }
 
         public void UpdateRemainingTime(TimeSpan remaining)