diff --git a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
index b0fac90e..b7017e5d 100644
--- a/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
+++ b/PROMS/VEPROMS.CSLA.Library/Extension/TransitionExt.cs
@@ -328,7 +328,7 @@ namespace VEPROMS.CSLA.Library
 			// format....
 			if (tranType > tb._FormatData.TransData.TransTypeList.Count)
 				tranType = 0;
-			tb._TransFormat = tb._FormatData.TransData.TransTypeList[tranType].TransFormat;
+			tb._TransFormat = tb._FormatData.TransData.TransTypeList[tranType].TransFormat.Replace(", {.}, {.}, {.}", "{.}");
 			tb._TransUI = (E_TransUI)tb._FormatData.TransData.TransTypeList[tranType].TransUI;
 			tb._FromItem = fromInfo;
 			tb._TranType = tranType;
@@ -499,10 +499,21 @@ namespace VEPROMS.CSLA.Library
 		private static bool AddIncludedStepNumber(bool textAdded, TransitionBuilder tb, string token, string nonToken)
 		{
 			if (textAdded) Append(tb, nonToken, false);
-			Append(tb, Tab(tb._ToItem), true);		// TODO: Intermediate Range.
+			ItemInfo next = GetNextItem(tb._ToItem);
+			while (next.ItemID != tb._RangeItem.ItemID)
+			{
+				Append(tb, ", " + Tab(next), true);		// TODO: Intermediate Range.
+				next = GetNextItem(next);
+			}
 			textAdded = true;
 			return textAdded;
 		}
+		private static ItemInfo GetNextItem(ItemInfo next)
+		{
+			while (next.NextItem == null)
+				next = next.ActiveParent as ItemInfo;
+			return next.NextItem;
+		}
 		private static bool AddOptionalTranGetSectionHdr(bool textAdded, TransitionBuilder tb, string token, string nonToken)
 		{
 			// output from 16-bit code looks like section header