diff --git a/PROMS/DataLoader/DocVersions.cs b/PROMS/DataLoader/DocVersions.cs
index c76e3762..eaf6140e 100644
--- a/PROMS/DataLoader/DocVersions.cs
+++ b/PROMS/DataLoader/DocVersions.cs
@@ -35,7 +35,6 @@ namespace DataLoader
 		public Item MigrateDocVersion(DocVersion docver, bool convertProcedures)
 		{
 			string pth = docver.Title;
-			// TODO: If set.dbf is missing or curset.dat is missing don't process it.
 			if (!File.Exists(pth + @"\set.dbf") || !File.Exists(pth + @"\curset.dat")) return null;			// Open connection
 			OleDbConnection cn = new OleDbConnection(@"Provider=Microsoft.Jet.OLEDB.4.0;Data Source=" + pth + ";Extended Properties=dBase III;Persist Security Info=False");
 			if (convertProcedures)
diff --git a/PROMS/DataLoader/Formats.cs b/PROMS/DataLoader/Formats.cs
index fcdc862a..7b7df56f 100644
--- a/PROMS/DataLoader/Formats.cs
+++ b/PROMS/DataLoader/Formats.cs
@@ -33,7 +33,7 @@ namespace DataLoader
             string genmacdata = null;
             XmlDocument xd = null;
 
-            string path = "e:\\fmtall\\" + format + "all.xml";
+            string path = "c:\\development\\fmtall\\" + format + "all.xml";
             if (File.Exists(path))
             {
                 xd = new XmlDocument();
@@ -44,7 +44,7 @@ namespace DataLoader
             // Do we need genmac - only if non-subformat
             if (!issub)
             {
-                path = "e:\\genmacall\\" + format + ".svg";
+                path = "c:\\development\\genmacall\\" + format + ".svg";
                 if (File.Exists(path))
                 {
                     XmlDocument xdg = new XmlDocument();
@@ -82,7 +82,7 @@ namespace DataLoader
 
 			// now loop through all files... If there is an _ in the name, it's a subformat
 			// (for example, AEP_00.xml) skip it in main loop, it's handled for each format. 
-			DirectoryInfo di = new DirectoryInfo("e:\\fmtall");
+			DirectoryInfo di = new DirectoryInfo(@"c:\development\fmtall");
 			FileInfo[] fis = di.GetFiles("*.xml");
 
 			foreach (FileInfo fi in fis)
@@ -96,7 +96,7 @@ namespace DataLoader
 
 					// now see if there are any subformats associated with this, if so
 					// add them here... 
-					DirectoryInfo sdi = new DirectoryInfo("e:\\fmtall");
+                    DirectoryInfo sdi = new DirectoryInfo("c:\\development\\fmtall");
 					FileInfo[] sfis = di.GetFiles(fmtname+"_*.xml");
 					foreach (FileInfo sfi in sfis)
 					{
diff --git a/PROMS/DataLoader/LibDoc.cs b/PROMS/DataLoader/LibDoc.cs
index e770186b..928c64c4 100644
--- a/PROMS/DataLoader/LibDoc.cs
+++ b/PROMS/DataLoader/LibDoc.cs
@@ -107,20 +107,6 @@ namespace DataLoader
 				byte[] buf = new byte[l];
 				br.Read(buf, 0, (int)l);
 				bw.Write(buf, 0, (int)l);
-				// TODO: Check with KBR to see if she needed read/write this way
-                // I can't remember.
-				//byte ac;  
-				//bool done = false;
-				//while (done == false)
-				//{
-				//  if (br.PeekChar() > 0)
-				//  {
-				//    ac = br.ReadByte();
-				//    bw.Write(ac);
-				//  }
-				//  else
-				//    done = true;
-				//}
 				br.Close();
 				fs.Close();
 				bw.Close();
diff --git a/PROMS/DataLoader/LoadTreeDB.cs b/PROMS/DataLoader/LoadTreeDB.cs
index ee0d21b1..f6ab17b1 100644
--- a/PROMS/DataLoader/LoadTreeDB.cs
+++ b/PROMS/DataLoader/LoadTreeDB.cs
@@ -107,9 +107,8 @@ namespace DataLoader
 						format = Format.Get(1);
 					DocVersion v = DocVersion.MakeDocVersion(tmpfld, (int)DocVersionType(vb.Path.ToLower()), thetitle, vb.Path.ToLower(), null, format, fld_cfg == null ? null : fld_cfg.ToString(), DateTime.Now, "Migration");
                     tn.Tag = v;
-						//TODO: load procedure set
-						  MigrateDocVersion(v, false);
-						  return (object)v;
+					MigrateDocVersion(v, false);
+					return (object)v;
             }
             return 0;
         }
diff --git a/PROMS/DataLoader/OutsideTransition.cs b/PROMS/DataLoader/OutsideTransition.cs
index 50d63864..69c7d0a5 100644
--- a/PROMS/DataLoader/OutsideTransition.cs
+++ b/PROMS/DataLoader/OutsideTransition.cs
@@ -186,9 +186,9 @@ namespace DataLoader
 		{
 			if (_DocVersions == null) 
 				_DocVersions = DocVersionInfoList.Get();
-			DocVersionInfo dvi = ExactMatch(path); //TODO: Look for an exact match of the paths.
-			if (dvi == null) dvi = PartialMatch(path);//TODO: If none is found, look for a partial match.
-			if (dvi != null) return FindItem(dvi, procnum);//TODO: Look for the Procedure number in the procedure list and return item that matches
+			DocVersionInfo dvi = ExactMatch(path);
+			if (dvi == null) dvi = PartialMatch(path);
+			if (dvi != null) return FindItem(dvi, procnum);
 			return null;
 		}
 
diff --git a/PROMS/DataLoader/Procedures.cs b/PROMS/DataLoader/Procedures.cs
index 0e079503..f9f7be9c 100644
--- a/PROMS/DataLoader/Procedures.cs
+++ b/PROMS/DataLoader/Procedures.cs
@@ -129,12 +129,12 @@ namespace DataLoader
 			Item itm =null;
 			string number = TextConvert.ConvertText(dr["Number"].ToString());
       frmMain.UpdateLabels(1, 0, 0);
-		if (!convertProcedures || docver.VersionType != (int)VEPROMS.CSLA.Library.VersionTypeEnum.WorkingDraft)// TODO: if convertProcedures == False -  create item and content
+		if (!convertProcedures || docver.VersionType != (int)VEPROMS.CSLA.Library.VersionTypeEnum.WorkingDraft)
 						{
 			cont = Content.New(number, TextConvert.ConvertText(dr["Title"].ToString(),do_cvt), 0, null, ci == null ? null : ci.ToString(), dts, userid);
 			itm = Item.MakeItem(FromItem, cont, dts, userid);
 						}
-		else // TODO: if convertProcedures == True - Find existing item.
+		else
 				{
 					DocVersionInfo dvi = DocVersionInfo.Get(docver.VersionID);
 				foreach(ItemInfo ii in dvi.Procedures){
diff --git a/PROMS/DataLoader/Transitions.cs b/PROMS/DataLoader/Transitions.cs
index 837b0d13..46f8611a 100644
--- a/PROMS/DataLoader/Transitions.cs
+++ b/PROMS/DataLoader/Transitions.cs
@@ -38,7 +38,6 @@ namespace DataLoader
 		private string AddTrans(OleDbConnection cn, Content fromCon, DataRow dr, DataRow dr2, string pth)
         {
 			List<string> migrationErrors = new List<string>();
-            //TODO: ZTransitions tr.Oldto = dr["OLDTO"].ToString();
             string thekey = dr["TONUMBER"].ToString() + "|" + dr["TOSEQUENCE"].ToString();
             string dti = dr["DTI"].ToString().PadRight(18, ' ');
             string userid = dti.Substring(13, 5).Trim();
diff --git a/PROMS/DataLoader/frmLoader.Designer.cs b/PROMS/DataLoader/frmLoader.Designer.cs
index f71463ff..06ab1344 100644
--- a/PROMS/DataLoader/frmLoader.Designer.cs
+++ b/PROMS/DataLoader/frmLoader.Designer.cs
@@ -154,7 +154,7 @@ namespace DataLoader
 			this.tbVesamPath.Name = "tbVesamPath";
 			this.tbVesamPath.Size = new System.Drawing.Size(469, 22);
 			this.tbVesamPath.TabIndex = 66;
-			this.tbVesamPath.Text = "e:\\ve-proms\\vesam.opt";
+			this.tbVesamPath.Text = "c:\\16bit\\ve-proms\\vesam.opt";
 			// 
 			// btnVesam
 			// 
diff --git a/PROMS/DataLoader/frmLoader.cs b/PROMS/DataLoader/frmLoader.cs
index 495e9b88..2ef46c33 100644
--- a/PROMS/DataLoader/frmLoader.cs
+++ b/PROMS/DataLoader/frmLoader.cs
@@ -76,6 +76,9 @@ namespace DataLoader
 					//tbSource.Text = "G:\\vecal\\eops.bck";  // test link seq STP_LNK_SEQ
 					tbSource.Text = "G:\\vehlp\\procs";//  G:\\vewcnckl\\ckl.prc - multiple change ids.
 					break;
+                case "KATHY-VISTA":
+                    tbSource.Text = @"c:\16bit\debug\vehlp\procs";//  G:\\vewcnckl\\ckl.prc - multiple change ids.
+                    break;
 				case "RHMDESKTOP":
 					//tbSource.Text = @"I:\UNZIPPED ACTIVE BASELINE DATA\vehlp\Procs"; // Sub-sections
 					tbSource.Text = @"I:\veDATA\vehlp\Procs"; // Sub-sections