diff --git a/CommonUtil/TextUtil.cs b/CommonUtil/TextUtil.cs
index 99fd1f1..7e26a8c 100644
--- a/CommonUtil/TextUtil.cs
+++ b/CommonUtil/TextUtil.cs
@@ -116,9 +116,9 @@ namespace CommonUtil {
         /// messing with the quoted items.  Assumes that quoted quotes (backslash-quote) only
         /// appear inside quoted text.
         /// </summary>
-        /// <param name="inStr"></param>
-        /// <param name="findStr"></param>
-        /// <param name="repStr"></param>
+        /// <param name="inStr">Input string.</param>
+        /// <param name="findStr">Substring to find.</param>
+        /// <param name="repStr">If string found, replace with this.</param>
         public static string NonQuoteReplace(string inStr, string findStr, string repStr) {
             // There's probably a better way to do this...
             StringBuilder sb = new StringBuilder(inStr.Length + inStr.Length / 20);
diff --git a/SourceGen/MainController.cs b/SourceGen/MainController.cs
index 8543b18..ebdef62 100644
--- a/SourceGen/MainController.cs
+++ b/SourceGen/MainController.cs
@@ -1126,6 +1126,7 @@ namespace SourceGen {
 
             mProject = newProject;
             mProjectPathName = mProject.ProjectPathName = projPathName;
+            mDataPathName = dataPathName;
             FinishPrep();
         }
 
diff --git a/SourceGen/ProjectFile.cs b/SourceGen/ProjectFile.cs
index 6ce86c8..4a2c706 100644
--- a/SourceGen/ProjectFile.cs
+++ b/SourceGen/ProjectFile.cs
@@ -75,6 +75,7 @@ namespace SourceGen {
                     // much more useful.
                     serializedData = TextUtil.NonQuoteReplace(serializedData, "{", "{\r\n");
                     serializedData = TextUtil.NonQuoteReplace(serializedData, "},", "},\r\n");
+                    serializedData = TextUtil.NonQuoteReplace(serializedData, ",", ",\r\n");
                 }
 
                 // Check to see if the project file is read-only.  We want to fail early