diff --git a/Elwig/Documents/Document.cs b/Elwig/Documents/Document.cs
index 02cb73a..d29699e 100644
--- a/Elwig/Documents/Document.cs
+++ b/Elwig/Documents/Document.cs
@@ -11,6 +11,8 @@ namespace Elwig.Documents {
 
         public static string Name => "Dokument";
 
+        private static readonly double GenerationProportion = 0.125;
+
         private TempFile? _pdfFile = null;
 
         public bool ShowFoldMarks = App.Config.Debug;
@@ -95,10 +97,10 @@ namespace Elwig.Documents {
                     await File.WriteAllTextAsync(tmpHtml.FilePath, await doc.Render(), Utils.UTF8);
                     tmpHtmls.Add(tmpHtml);
                     i++;
-                    progress?.Report(25.0 * i / n);
+                    progress?.Report(GenerationProportion * i / n);
                 }
-                progress?.Report(25.0);
-                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(25.0 + v * 0.75)));
+                progress?.Report(GenerationProportion);
+                await Pdf.Convert(tmpHtmls.Select(f => f.FileName), pdf.FileName, DoubleSided, new Progress<double>(v => progress?.Report(GenerationProportion + v * (1 - GenerationProportion))));
                 foreach (var tmp in tmpHtmls) {
                     tmp.Dispose();
                 }
diff --git a/Elwig/Windows/PaymentVariantsWindow.xaml.cs b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
index b2ae356..3c8e7c3 100644
--- a/Elwig/Windows/PaymentVariantsWindow.xaml.cs
+++ b/Elwig/Windows/PaymentVariantsWindow.xaml.cs
@@ -56,11 +56,13 @@ namespace Elwig.Windows {
                 CommentInput.Text = v.Comment;
                 DateInput.Text = $"{v.Date:dd.MM.yyyy}";
                 TransferDateInput.Text = $"{v.TransferDate:dd.MM.yyyy}";
-                try {
-                    var json = BillingData.ParseJson(v.Data);
-                    DataInput.Text = JsonSerializer.Serialize(json, JsonOpt);
-                } catch {
-                    DataInput.Text = v.Data;
+                if (App.Config.Debug) {
+                    try {
+                        var json = BillingData.ParseJson(v.Data);
+                        DataInput.Text = JsonSerializer.Serialize(json, JsonOpt);
+                    } catch {
+                        DataInput.Text = v.Data;
+                    }
                 }
             } else {
                 EditButton.Content = "Bearbeiten";