diff --git a/DATabase/DATabase.csproj b/DATabase/DATabase.csproj
index 7683a74d..033973c3 100644
--- a/DATabase/DATabase.csproj
+++ b/DATabase/DATabase.csproj
@@ -52,7 +52,7 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
     <OutputPath>..\..\Debug-x64\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <DefineConstants>TRACE;DEBUG</DefineConstants>
     <DebugType>full</DebugType>
     <PlatformTarget>x64</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
diff --git a/SabreHelper/DatTools/RomManipulation.cs b/SabreHelper/DatTools/DatTools.cs
similarity index 99%
rename from SabreHelper/DatTools/RomManipulation.cs
rename to SabreHelper/DatTools/DatTools.cs
index d9dd6ac2..ef08fb73 100644
--- a/SabreHelper/DatTools/RomManipulation.cs
+++ b/SabreHelper/DatTools/DatTools.cs
@@ -1710,17 +1710,17 @@ namespace SabreTools.Helper
 			string romtype, long sgt, long slt, long seq, string crc, string md5, string sha1, bool? nodump, Logger logger)
 		{
 			// Clean the input strings
-			outputDirectory = outputDirectory.Replace("\"", "");
-			if (outputDirectory != "")
-			{
-				outputDirectory = Path.GetFullPath(outputDirectory) + Path.DirectorySeparatorChar;
-			}
 			inputFileName = inputFileName.Replace("\"", "");
+			if (inputFileName != "")
+			{
+				inputFileName = Path.GetFullPath(inputFileName);
+			}
+			outputDirectory = outputDirectory.Replace("\"", "");
 
 			if (File.Exists(inputFileName))
 			{
 				logger.User("Processing \"" + Path.GetFileName(inputFileName) + "\"");
-				datdata = DatTools.Parse(inputFileName, 0, 0, datdata, logger, true, clean);
+				datdata = Parse(inputFileName, 0, 0, datdata, logger, true, clean);
 				datdata = Filter(datdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger);
 
 				// If the extension matches, append ".new" to the filename
@@ -1741,7 +1741,7 @@ namespace SabreTools.Helper
 					logger.User("Processing \"" + Path.GetFullPath(file).Remove(0, inputFileName.Length) + "\"");
 					DatData innerDatdata = (DatData)datdata.Clone();
 					innerDatdata.Roms = null;
-					innerDatdata = DatTools.Parse(file, 0, 0, innerDatdata, logger, true, clean);
+					innerDatdata = Parse(file, 0, 0, innerDatdata, logger, true, clean);
 					innerDatdata = Filter(innerDatdata, gamename, romname, romtype, sgt, slt, seq, crc, md5, sha1, nodump, logger);
 
 					// If the extension matches, append ".new" to the filename
@@ -1922,6 +1922,9 @@ namespace SabreTools.Helper
 				datdata.Roms[key] = null;
 			}
 
+			// Resassign the new dictionary to the DatData object
+			datdata.Roms = dict;
+
 			return datdata;
 		}
 	}
diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj
index fccb978d..1f432215 100644
--- a/SabreHelper/SabreHelper.csproj
+++ b/SabreHelper/SabreHelper.csproj
@@ -100,7 +100,7 @@
     <Compile Include="DatTools\Output.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Remapping.cs" />
-    <Compile Include="DatTools\RomManipulation.cs" />
+    <Compile Include="DatTools\DatTools.cs" />
     <Compile Include="Data\Structs.cs" />
     <Compile Include="DatTools\Stats.cs" />
     <Compile Include="DatTools\Style.cs" />
diff --git a/SabreHelper/sqlite3.dll b/SabreHelper/sqlite3.dll
index fcac1b2d..2797682c 100644
Binary files a/SabreHelper/sqlite3.dll and b/SabreHelper/sqlite3.dll differ