diff --git a/slsk-batchdl/Data.cs b/slsk-batchdl/Data.cs
index c010de8..aa77414 100644
--- a/slsk-batchdl/Data.cs
+++ b/slsk-batchdl/Data.cs
@@ -78,9 +78,19 @@ namespace Data
                 if (str.Length > 0)
                     str += " - ";
                 if (Type == TrackType.Album)
-                    str += Album;
-                else if (Title.Length > 0)
-                    str += Title;
+                {
+                    if (Album.Length > 0)
+                        str += Album;
+                    else
+                        str += Title;
+                }
+                else
+                {
+                    if (Title.Length > 0)
+                        str += Title;
+                    else
+                        str += Album;
+                }
                 if (!noInfo)
                 {
                     if (Length > 0)
diff --git a/slsk-batchdl/Help.cs b/slsk-batchdl/Help.cs
index 3621681..16ebcb2 100644
--- a/slsk-batchdl/Help.cs
+++ b/slsk-batchdl/Help.cs
@@ -1,7 +1,7 @@
 
 // undocumented options
 // --login, --random-login, --no-modify-share-count, --unknown-error-retries
-// --invalid-replace-str, --cond, --pref, --danger-words, --pref-danger-words, --strict-title, --strict-artist, --strict-album
+// --invalid-replace-str, --cond, --pref, --strict-title, --strict-artist, --strict-album
 // --fast-search-delay, --fast-search-min-up-speed
 // --min-album-track-count, --max-album-track-count, --extract-max-track-count, --extract-min-track-count 
 
diff --git a/slsk-batchdl/Program.cs b/slsk-batchdl/Program.cs
index 93fcdf2..0e31666 100644
--- a/slsk-batchdl/Program.cs
+++ b/slsk-batchdl/Program.cs
@@ -872,7 +872,7 @@ static partial class Program
             Console.WriteLine();
 
             Loop:
-            string userInput = interactiveModeLoop().Trim();
+            string userInput = interactiveModeLoop().Trim().ToLower();
             switch (userInput)
             {
                 case "p":