diff --git a/PROMS/Formats/fmtall/BGEOIall.xml b/PROMS/Formats/fmtall/BGEOIall.xml
index 09a1f86c..7cdf1559 100644
Binary files a/PROMS/Formats/fmtall/BGEOIall.xml and b/PROMS/Formats/fmtall/BGEOIall.xml differ
diff --git a/PROMS/Formats/fmtall/BGESTPall.xml b/PROMS/Formats/fmtall/BGESTPall.xml
index d133b266..73def6bd 100644
Binary files a/PROMS/Formats/fmtall/BGESTPall.xml and b/PROMS/Formats/fmtall/BGESTPall.xml differ
diff --git a/PROMS/Formats/fmtall/BGEVLall.xml b/PROMS/Formats/fmtall/BGEVLall.xml
index 25f25099..aeaf1474 100644
Binary files a/PROMS/Formats/fmtall/BGEVLall.xml and b/PROMS/Formats/fmtall/BGEVLall.xml differ
diff --git a/PROMS/Volian.Print.Library/vlnParagraph.cs b/PROMS/Volian.Print.Library/vlnParagraph.cs
index 2a49b8ca..1736a965 100644
--- a/PROMS/Volian.Print.Library/vlnParagraph.cs
+++ b/PROMS/Volian.Print.Library/vlnParagraph.cs
@@ -512,8 +512,10 @@ namespace Volian.Print.Library
 					{
 						PageCount pc = MyPageHelper.MyTOCPageCounts[tocKey];
 						if (pc.Total == 0)
+						{
 							pc.Total = MyPageHelper.CurrentTOCPageNumber + 1;
-						pc.DrawTemplates();
+							pc.DrawTemplates();
+						}
 					}
 				}
 			}
@@ -2421,9 +2423,11 @@ namespace Volian.Print.Library
 			float addExtraSpace = 0;
 			if (MyItemInfo.FormatStepData != null && MyItemInfo.ActiveFormat.MyStepSectionLayoutData.CustomSpacing)
 				addExtraSpace = MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
-			if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null &&
-				MyItemInfo.MyParent.FormatStepData.Type != "TitleWithTextRight")
-				addExtraSpace = (MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
+			//if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null &&
+			//    MyItemInfo.MyParent.FormatStepData.Type != "TitleWithTextRight")
+			//    addExtraSpace = (MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
+			if (MyItemInfo.MyParent != null && MyItemInfo.MyParent.FormatStepData != null)
+				addExtraSpace = (MyItemInfo.MyParent.FormatStepData.Type == "TitleWithTextRight" || MyItemInfo.FormatStepData == null) ? 0 : MyItemInfo.FormatStepData.StepLayoutData.STExtraSpace ?? 0;
 			// If a high level step, the 16bit code uses the value of the extra space
 			// from the high level step format regardless of what type of high level step it is: 
 			// Added check for UseSTExtraRealValue, if set, we want to use what is set for the specific step type