diff --git a/DATabase/DATabase.cs b/DATabase/DATabase.cs
index 729b62fb..91e15fb7 100644
--- a/DATabase/DATabase.cs
+++ b/DATabase/DATabase.cs
@@ -274,7 +274,7 @@ Make a selection:
     6) Convert a DAT file from XML to RV
     7) List all available sources
     8) List all available systems
-    9) Add and Remove from database
+    9) Add and remove systems and sources
     10) " + (logger.ToFile ? "Disable Logging" : "Enable Logging") + @"
     11) Show credits
     X) Exit Program
@@ -368,6 +368,9 @@ or 'b' to go back to the previous menu:");
 		{
 			Console.Clear();
 
+			// Drag and drop means quotes; we don't want quotes
+			filename = filename.Replace("\"", "");
+
 			// Check to see if the second argument is a file that exists
 			if (filename != "" && File.Exists(filename))
 			{
@@ -389,7 +392,7 @@ or 'b' to go back to the previous menu:");
 			}
 			else
 			{
-				logger.Error("I'm sorry but " + filename + "doesn't exist!");
+				logger.Error("I'm sorry but " + filename + " doesn't exist!");
 			}
 			return;
 		}
diff --git a/SabreHelper/Default/DATabase.sqlite b/SabreHelper/DATabase.sqlite
similarity index 100%
rename from SabreHelper/Default/DATabase.sqlite
rename to SabreHelper/DATabase.sqlite
diff --git a/SabreHelper/Default/Headerer.sqlite b/SabreHelper/Headerer.sqlite
similarity index 100%
rename from SabreHelper/Default/Headerer.sqlite
rename to SabreHelper/Headerer.sqlite
diff --git a/SabreHelper/SabreHelper.csproj b/SabreHelper/SabreHelper.csproj
index 3fc47431..9e09b180 100644
--- a/SabreHelper/SabreHelper.csproj
+++ b/SabreHelper/SabreHelper.csproj
@@ -83,11 +83,11 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
-    <None Include="Default\DATabase.sqlite">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Include="DATabase.sqlite">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="Default\Headerer.sqlite">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Include="Headerer.sqlite">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Include="LICENSE">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>