diff --git a/PROMS/VEPROMS User Interface/frmVEPROMS.cs b/PROMS/VEPROMS User Interface/frmVEPROMS.cs
index cce98863..bee6fd37 100644
--- a/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
+++ b/PROMS/VEPROMS User Interface/frmVEPROMS.cs	
@@ -82,18 +82,20 @@ namespace VEPROMS
 		{
 			InitializeComponent();
 #if (DEBUG)
-			//use local data
+			//use local data (for development/debug mode)
 			if (Environment.MachineName == "RMARK-PC")
 				VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEBUG";
 			else
 				VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";
 #else
 			// use server data (default)
-			//VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS";
+			// - except for the volian laptop and Rich's Demo version where we need to use local data
 			if (Environment.MachineName == "RMARK-PC")
 				VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_RMARK_DEMO";
-			else if (Environment.MachineName == "laptop")
+			else if (Environment.MachineName == "DELL-D430")
 				VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS_LOCAL";
+			else
+				VEPROMS.CSLA.Library.Database.ConnectionName = "VEPROMS";
 
 #endif
 			// set the color of the ribbon
@@ -776,6 +778,7 @@ namespace VEPROMS
 			displayRO.Mydvi = SelectedDVI;
 			displayRO.MyROFST = SelectedROFst;
 			displayRO.MyRTB = (SelectedStepTabPanel == null) ? null : SelectedStepTabPanel.MyStepPanel.SelectedStepItem.MyStepRTB;
+			displayRO.TabControl = tc;
 			
 			displayRO.ProgressBar = bottomProgBar;
 		}