diff --git a/DATabase/MergeDiff.cs b/DATabase/MergeDiff.cs
index 2140b07c..0fc4490a 100644
--- a/DATabase/MergeDiff.cs
+++ b/DATabase/MergeDiff.cs
@@ -199,9 +199,12 @@ namespace SabreTools
 					{
 						if (rom.Dupe < DupeType.ExternalHash)
 						{
+							RomData newrom = rom;
+							newrom.Game += " (" + Path.GetFileNameWithoutExtension(_inputs[newrom.SystemID].Split('¬')[0]) + ")";
+
 							if (outerDiffData.Roms.ContainsKey(key))
 							{
-								outerDiffData.Roms[key].Add(rom);
+								outerDiffData.Roms[key].Add(newrom);
 							}
 							else
 							{
@@ -284,9 +287,12 @@ namespace SabreTools
 					{
 						if (rom.Dupe >= DupeType.ExternalHash)
 						{
+							RomData newrom = rom;
+							newrom.Game += " (" + Path.GetFileNameWithoutExtension(_inputs[newrom.SystemID].Split('¬')[0]) + ")";
+
 							if (dupeData.Roms.ContainsKey(key))
 							{
-								dupeData.Roms[key].Add(rom);
+								dupeData.Roms[key].Add(newrom);
 							}
 							else
 							{
@@ -370,7 +376,7 @@ namespace SabreTools
 					}
 					else if (!String.IsNullOrEmpty(_outdir))
 					{
-						path = _outdir + (_inputs[j].Split('¬')[0].Remove(0, _inputs[j].Split('¬')[1].Length));
+						path = _outdir + (Path.GetDirectoryName(_inputs[j].Split('¬')[0]).Remove(0, _inputs[j].Split('¬')[1].Length));
 					}
 
 					Output.WriteDatfile(diffData, path, _logger);
diff --git a/SabreHelper/Build.cs b/SabreHelper/Build.cs
index 5b85e2d0..e16a496d 100644
--- a/SabreHelper/Build.cs
+++ b/SabreHelper/Build.cs
@@ -123,7 +123,7 @@ Options:
 	-b, --bare		Don't include date in file name
 	-u, --unzip		Force unzipping in created DAT
 	-o, --old		Output DAT in CMP format instead of XML
-	-out=			Output directory (overridden by --cascade)
+	-out=			Output directory (overridden by --inplace)
 	-sd, --superdat		Enable SuperDAT creation
 	-n=, --name=		Set the internal name of the DAT
 	-d=, --desc=		Set the filename and description of the DAT