diff --git a/CHANGELIST.md b/CHANGELIST.md
index 20c7b044..72852343 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -1,3 +1,7 @@
+### WIP (xxxx-xx-xx)
+
+- Clean up some Check options, add IRD option
+
 ### 3.2.1 (2024-08-05)
 
 - Add nuget packing for processors and contexts
diff --git a/MPF.Check/Program.cs b/MPF.Check/Program.cs
index c20b0185..85d395be 100644
--- a/MPF.Check/Program.cs
+++ b/MPF.Check/Program.cs
@@ -20,14 +20,25 @@ namespace MPF.Check
             // Create a default options object
             var options = new Frontend.Options()
             {
-                RedumpUsername = null,
-                RedumpPassword = null,
                 InternalProgram = InternalProgram.NONE,
+
+                ScanForProtection = false,
+                AddPlaceholders = true,
+                PullAllInformation = false,
                 AddFilenameSuffix = false,
                 OutputSubmissionJSON = false,
                 IncludeArtifacts = false,
                 CompressLogFiles = false,
                 DeleteUnnecessaryFiles = false,
+                CreateIRDAfterDumping = false,
+
+                // ScanArchivesForProtection = false,
+                // ScanPackersForProtection = false,
+                // IncludeDebugProtectionInformation = false,
+                HideDriveLetters = false,
+
+                RedumpUsername = null,
+                RedumpPassword = null,
             };
 
             // Try processing the standalone arguments
@@ -114,12 +125,14 @@ namespace MPF.Check
 
             Console.WriteLine("Check Options:");
             Console.WriteLine("-u, --use <program>            Dumping program output type [REQUIRED]");
+            Console.WriteLine("    --load-seed <path>         Load a seed submission JSON for user information");
+            Console.WriteLine("    --no-placeholders          Disable placeholder values in submission info");
+            Console.WriteLine("    --create-ird               Create IRD from output files (PS3 only)");
             Console.WriteLine("-c, --credentials <user> <pw>  Redump username and password");
             Console.WriteLine("    --pull-all                 Pull all information from Redump (requires --credentials)");
             Console.WriteLine("-p, --path <drivepath>         Physical drive path for additional checks");
             Console.WriteLine("-s, --scan                     Enable copy protection scan (requires --path)");
             Console.WriteLine("    --hide-drive-letters       Hide drive letters from scan output (requires --scan)");
-            Console.WriteLine("-l, --load-seed <path>         Load a seed submission JSON for user information");
             Console.WriteLine("-x, --suffix                   Enable adding filename suffix");
             Console.WriteLine("-j, --json                     Enable submission JSON output");
             Console.WriteLine("    --include-artifacts        Include artifacts in JSON (requires --json)");
@@ -163,6 +176,31 @@ namespace MPF.Check
                     startIndex++;
                 }
 
+                // Include seed info file
+                else if (args[startIndex].StartsWith("--load-seed="))
+                {
+                    string seedInfo = args[startIndex].Split('=')[1];
+                    opts.Seed = Builder.CreateFromFile(seedInfo);
+                }
+                else if (args[startIndex] == "--load-seed")
+                {
+                    string seedInfo = args[startIndex + 1];
+                    opts.Seed = Builder.CreateFromFile(seedInfo);
+                    startIndex++;
+                }
+
+                // Disable placeholder values in submission info
+                else if (args[startIndex].Equals("--no-placeholders"))
+                {
+                    options.AddPlaceholders = false;
+                }
+
+                // Create IRD from output files (PS3 only)
+                else if (args[startIndex].Equals("--create-ird"))
+                {
+                    options.CreateIRDAfterDumping = true;
+                }
+
                 // Redump login
                 else if (args[startIndex].StartsWith("-c=") || args[startIndex].StartsWith("--credentials="))
                 {
@@ -206,19 +244,6 @@ namespace MPF.Check
                     hideDriveLetters = true;
                 }
 
-                // Include seed info file
-                else if (args[startIndex].StartsWith("-l=") || args[startIndex].StartsWith("--load-seed="))
-                {
-                    string seedInfo = args[startIndex].Split('=')[1];
-                    opts.Seed = Builder.CreateFromFile(seedInfo);
-                }
-                else if (args[startIndex] == "-l" || args[startIndex] == "--load-seed")
-                {
-                    string seedInfo = args[startIndex + 1];
-                    opts.Seed = Builder.CreateFromFile(seedInfo);
-                    startIndex++;
-                }
-
                 // Add filename suffix
                 else if (args[startIndex].Equals("-x") || args[startIndex].Equals("--suffix"))
                 {