diff --git a/cfg/CfgDocument.cs b/cfg/CfgDocument.cs
index 26f1e9e..a57b023 100644
--- a/cfg/CfgDocument.cs
+++ b/cfg/CfgDocument.cs
@@ -57,17 +57,17 @@ public string StartSymbol {
 				{
 					if (!IsSymbol(value))
 						throw new KeyNotFoundException("The specified symbol does not exist");
-					foreach(var sattrs in AttributeSets)
+					foreach (var sattrs in AttributeSets)
 					{
-						var i =sattrs.Value.IndexOf("start");
-						if(-1<i && (sattrs.Value[i].Value is bool) && (bool)sattrs.Value[i].Value)
+						var i = sattrs.Value.IndexOf("start");
+						if (-1 < i && (sattrs.Value[i].Value is bool) && (bool)sattrs.Value[i].Value)
 							sattrs.Value.RemoveAt(i);
-						if(sattrs.Key==value)
+						if (sattrs.Key == value)
 						{
 							i = sattrs.Value.IndexOf("start");
 							if (-1 < i)
-								sattrs.Value[i].Value=true;
-							else 
+								sattrs.Value[i].Value = true;
+							else
 								sattrs.Value.Add(new CfgAttribute("start", true));
 						}
 					}
@@ -77,7 +77,7 @@ public string StartSymbol {
 		public void InternSymbols()
 		{
 			var syms = FillSymbols();
-			for(int ic=syms.Count,i=0;i<ic;++i)
+			for (int ic = syms.Count, i = 0; i < ic; ++i)
 				string.Intern(syms[i]);
 		}
 		public bool IsDirectlyLeftRecursive {
@@ -93,14 +93,14 @@ public IEnumerable<string> EnumNonTerminals()
 		{
 			var seen = new HashSet<string>();
 			var ic = Rules.Count;
-			for(var i=0;i<ic;++i)
+			for (var i = 0; i < ic; ++i)
 			{
 				var s = Rules[i].Left;
 				if (seen.Add(s))
 					yield return s;
 			}
 		}
-		public IList<string> FillNonTerminals(IList<string> result=null)
+		public IList<string> FillNonTerminals(IList<string> result = null)
 		{
 			if (null == result)
 				result = new List<string>();
@@ -126,7 +126,7 @@ public IEnumerable<string> EnumSymbols()
 			for (var i = 0; i < ic; ++i)
 			{
 				var right = Rules[i].Right;
-				for(int jc=right.Count,j=0;j<jc;++j)
+				for (int jc = right.Count, j = 0; j < jc; ++j)
 				{
 					var s = right[j];
 					if (seen.Add(s))
@@ -164,11 +164,11 @@ public IList<string> FillSymbols(IList<string> result = null)
 							result.Add(s);
 				}
 			}
-			foreach(var attrs in AttributeSets)
-				if(seen.Add(attrs.Key))
+			foreach (var attrs in AttributeSets)
+				if (seen.Add(attrs.Key))
 					if (!result.Contains(attrs.Key))
 						result.Add(attrs.Key);
-				
+
 			if (!result.Contains("#EOS"))
 				result.Add("#EOS");
 			if (!result.Contains("#ERROR"))
@@ -405,7 +405,7 @@ public IDictionary<string, ICollection<string>> FillFirsts(IDictionary<string, I
 			if (null == result)
 				result = new Dictionary<string, ICollection<(CfgRule Rule, string Symbol)>>();
 			var predictNT = _FillPredictNT();
-			
+
 			// finally, for each non-terminal N we still have in the firsts, resolve FIRSTS(N)
 			foreach (var kvp in predictNT)
 			{
@@ -416,14 +416,14 @@ public IDictionary<string, ICollection<string>> FillFirsts(IDictionary<string, I
 					_ResolvePredict(item.Symbol, res, predictNT, new HashSet<string>());
 					foreach (var r in res)
 						col.Add((item.Rule, r));
-					
+
 				}
 				result.Add(kvp.Key, col);
 			}
 			return result;
 		}
 
-		void _ResolvePredict(string symbol,ICollection<string> result,IDictionary<string, ICollection<(CfgRule Rule, string Symbol)>> predictNT,HashSet<string> seen)
+		void _ResolvePredict(string symbol, ICollection<string> result, IDictionary<string, ICollection<(CfgRule Rule, string Symbol)>> predictNT, HashSet<string> seen)
 		{
 			if (seen.Add(symbol))
 			{
@@ -451,7 +451,7 @@ public IDictionary<string, ICollection<string>> FillFollows(IDictionary<string,
 			if (null == result)
 				result = new Dictionary<string, ICollection<string>>();
 
-			var	followsNT = new Dictionary<string, ICollection<string>>();
+			var followsNT = new Dictionary<string, ICollection<string>>();
 
 			// we'll need the predict table
 			//Console.Error.WriteLine("Computing predict...");
@@ -524,7 +524,7 @@ public IDictionary<string, ICollection<string>> FillFollows(IDictionary<string,
 			// below we look for any non-terminals in the follows result and replace them
 			// with their follows, so for example if N appeared, N would be replaced with 
 			// the result of FOLLOW(N)
-			
+
 			foreach (var nt in EnumNonTerminals())
 			{
 				var col = new HashSet<string>();
@@ -534,7 +534,7 @@ public IDictionary<string, ICollection<string>> FillFollows(IDictionary<string,
 			}
 			//Console.Error.WriteLine("Done!");
 			return result;
-	
+
 		}
 		void _ResolveFollows(string symbol, ICollection<string> result, IDictionary<string, ICollection<string>> followsNT, HashSet<string> seen)
 		{
@@ -619,13 +619,13 @@ public IList<string> FillClosure(string symbol, IList<string> result = null)
 			}
 			return result;
 		}
-		public object GetAttribute(string symbol,string name, object @default = null)
+		public object GetAttribute(string symbol, string name, object @default = null)
 		{
 			CfgAttributeList l;
-			if(AttributeSets.TryGetValue(symbol,out l))
+			if (AttributeSets.TryGetValue(symbol, out l))
 			{
 				var i = l.IndexOf(name);
-				if(-1<i)
+				if (-1 < i)
 					return l[i].Value;
 			}
 			return @default;
@@ -633,7 +633,7 @@ public object GetAttribute(string symbol,string name, object @default = null)
 		public bool IsNonTerminal(string symbol)
 		{
 			if (null != _ntCache) return _ntCache.Contains(symbol);
-			for(int ic=Rules.Count,i=0;i<ic;++i)
+			for (int ic = Rules.Count, i = 0; i < ic; ++i)
 				if (Rules[i].Left == symbol)
 					return true;
 			return false;
@@ -646,7 +646,7 @@ public bool IsSymbol(string symbol)
 				var rule = Rules[i];
 				if (rule.Left == symbol)
 					return true;
-				for(int jc=rule.Right.Count,j=0;j<jc;++j)
+				for (int jc = rule.Right.Count, j = 0; j < jc; ++j)
 				{
 					if (symbol == rule.Right[j])
 						return true;
@@ -657,7 +657,7 @@ public bool IsSymbol(string symbol)
 		public override string ToString()
 		{
 			var sb = new StringBuilder();
-			foreach(var attrSet in AttributeSets)
+			foreach (var attrSet in AttributeSets)
 			{
 				if (0 < attrSet.Value.Count)
 				{
@@ -671,7 +671,7 @@ public override string ToString()
 					sb.AppendLine();
 				}
 			}
-			for (int ic=Rules.Count,i=0;i<ic;++i)
+			for (int ic = Rules.Count, i = 0; i < ic; ++i)
 				sb.AppendLine(Rules[i].ToString());
 			return sb.ToString();
 		}
@@ -710,7 +710,7 @@ public static CfgDocument ReadFrom(string filename)
 		internal static CfgDocument Parse(ParseContext pc)
 		{
 			var result = new CfgDocument();
-			while(-1!=pc.Current)
+			while (-1 != pc.Current)
 			{
 				var line = pc.Line;
 				var column = pc.Column;
@@ -722,14 +722,14 @@ internal static CfgDocument Parse(ParseContext pc)
 					CfgNode.SkipCommentsAndWhitespace(pc);
 				}
 				var id = CfgNode.ParseIdentifier(pc);
-				if(string.IsNullOrEmpty(id))
+				if (string.IsNullOrEmpty(id))
 				{
 					pc.Advance();
 					CfgNode.SkipCommentsAndWhitespace(pc);
 					continue;
 				}
 				CfgNode.SkipCommentsAndWhitespace(pc);
-				
+
 				pc.Expecting(':', '-', '=');
 				if (':' == pc.Current) // attribute set
 				{
@@ -747,7 +747,8 @@ internal static CfgDocument Parse(ParseContext pc)
 					}
 					result.AttributeSets.Add(id, d);
 					CfgNode.SkipCommentsAndWhitespace(pc);
-				} else if ('-' == pc.Current)
+				}
+				else if ('-' == pc.Current)
 				{
 					pc.Advance();
 					pc.Expecting('>');
@@ -762,14 +763,15 @@ internal static CfgDocument Parse(ParseContext pc)
 						CfgNode.SkipCommentsAndWhitespace(pc);
 					}
 					result.Rules.Add(rule);
-				} else if ('=' == pc.Current)
+				}
+				else if ('=' == pc.Current)
 				{
 					pc.TrySkipUntil('\n', true);
 				}
 				if ('\n' == pc.Current)
 					pc.Advance();
 				CfgNode.SkipCommentsAndWhitespace(pc);
-				
+
 			}
 			return result;
 		}
@@ -790,7 +792,7 @@ public bool Equals(CfgDocument rhs)
 					foreach (var attr in attrs.Value)
 					{
 						var i = d.IndexOf(attr.Name);
-						if (0>i || !Equals(d[i].Value, attr.Value))
+						if (0 > i || !Equals(d[i].Value, attr.Value))
 							return false;
 					}
 				}
@@ -813,11 +815,11 @@ public override int GetHashCode()
 			var result = 0;
 			foreach (var attrs in AttributeSets)
 			{
-				if(null!=attrs.Key)
+				if (null != attrs.Key)
 					result ^= attrs.Key.GetHashCode();
 				foreach (var attr in attrs.Value)
 				{
-					if(null!=attr.Name)
+					if (null != attr.Name)
 						result ^= attr.Name.GetHashCode();
 					if (null != attr.Value)
 						result ^= attr.Value.GetHashCode();
@@ -843,4 +845,4 @@ public override int GetHashCode()
 		}
 		#endregion
 	}
-}
+}
\ No newline at end of file
diff --git a/pckw/XbnfToPckTransform.cs b/pckw/XbnfToPckTransform.cs
index fb1a80a..f4ff0df 100644
--- a/pckw/XbnfToPckTransform.cs
+++ b/pckw/XbnfToPckTransform.cs
@@ -5,16 +5,16 @@
 
 namespace Pck
 {
-	[Transform("xbnfToPck",".xbnf",".pck","Translates an xbnf grammar to a pck spec.")]
+	[Transform("xbnfToPck", ".xbnf", ".pck", "Translates an xbnf grammar to a pck spec.")]
 	static class XbnfToPckTransform
 	{
 		public static void Transform(TextReader input, TextWriter output)
 			=> Transform(XbnfDocument.ReadFrom(input), output);
-		public static void Transform(XbnfDocument document,TextWriter writer)
+		public static void Transform(XbnfDocument document, TextWriter writer)
 		{
 			var syms = new HashSet<string>();
 			// gather the attributes and production names
-			for(int ic=document.Productions.Count,i=0;i<ic;++i)
+			for (int ic = document.Productions.Count, i = 0; i < ic; ++i)
 			{
 				var p = document.Productions[i];
 				syms.Add(p.Name);
@@ -63,14 +63,14 @@ public static void Transform(XbnfDocument document,TextWriter writer)
 			for (int ic = document.Productions.Count, i = 0; i < ic; ++i)
 			{
 				var p = document.Productions[i];
-				if(!p.IsTerminal)
+				if (!p.IsTerminal)
 				{
-					var dys = _GetDysjunctions(document, syms,tmap,attrSets,rules,p,p.Expression);
+					var dys = _GetDysjunctions(document, syms, tmap, attrSets, rules, p, p.Expression);
 					ntd.Add(p.Name, dys);
 				}
 			}
 			// now that we've done that, write the rest of our attributes
-			foreach(var attrs in attrSets)
+			foreach (var attrs in attrSets)
 			{
 				writer.Write(string.Concat(attrs.Key, ":"));
 				var delim = "";
@@ -93,7 +93,7 @@ public static void Transform(XbnfDocument document,TextWriter writer)
 				}
 			}
 			// write our secondary rules
-			foreach(var rule in rules)
+			foreach (var rule in rules)
 			{
 				writer.Write(string.Concat(rule.Key, "->"));
 				foreach (var s in rule.Value)
@@ -102,28 +102,28 @@ public static void Transform(XbnfDocument document,TextWriter writer)
 			}
 			writer.WriteLine();
 			// write our terminals
-			for(int ic = tmap.Count,i=0;i<ic;++i)
+			for (int ic = tmap.Count, i = 0; i < ic; ++i)
 			{
 				var te = tmap[i];
-				writer.WriteLine(string.Concat(te.Value,"= \'",_ToRegex(document,te.Key),"\'"));
-				
+				writer.WriteLine(string.Concat(te.Value, "= \'", _ToRegex(document, te.Key), "\'"));
+
 			}
 			writer.Flush();
 			return;
 		}
-		static string _ToRegex(XbnfDocument d,XbnfExpression e)
+		static string _ToRegex(XbnfDocument d, XbnfExpression e)
 		{
 			var le = e as XbnfLiteralExpression;
-			if(null!=le)
+			if (null != le)
 				return _EscapeLiteral(XbnfNode.Escape(le.Value));
 			var rxe = e as XbnfRegexExpression;
 			if (null != rxe)
-				return string.Concat("(",rxe.Value,")");
+				return string.Concat("(", rxe.Value, ")");
 			var rfe = e as XbnfRefExpression;
 			if (null != rfe)
 				_ToRegex(d, d.Productions[rfe.Symbol].Expression);
 			var re = e as XbnfRepeatExpression;
-			if(null!=re)
+			if (null != re)
 			{
 				if (re.IsOptional)
 					return string.Concat("(", _ToRegex(d, re.Expression), ")*");
@@ -131,11 +131,11 @@ static string _ToRegex(XbnfDocument d,XbnfExpression e)
 					return string.Concat("(", _ToRegex(d, re.Expression), ")+");
 			}
 			var oe = e as XbnfOrExpression;
-			if(null!=oe)
-				return string.Concat("(", _ToRegex(d,oe.Left), "|", _ToRegex(d,oe.Right), ")");
+			if (null != oe)
+				return string.Concat("(", _ToRegex(d, oe.Left), "|", _ToRegex(d, oe.Right), ")");
 			var oc = e as XbnfConcatExpression;
-			if(null!=oc)
-				return string.Concat(_ToRegex(d, oe.Left),  _ToRegex(d, oe.Right));
+			if (null != oc)
+				return string.Concat(_ToRegex(d, oe.Left), _ToRegex(d, oe.Right));
 			var ope = e as XbnfOptionalExpression;
 			if (null != ope)
 				return string.Concat("(", _ToRegex(d, ope.Expression), ")?");
@@ -144,9 +144,9 @@ static string _ToRegex(XbnfDocument d,XbnfExpression e)
 		static string _EscapeLiteral(string v)
 		{
 			var sb = new StringBuilder();
-			for(var i = 0;i<v.Length;++i)
+			for (var i = 0; i < v.Length; ++i)
 			{
-				switch(v[i])
+				switch (v[i])
 				{
 					case '[':
 					case ']':
@@ -177,15 +177,15 @@ static string _EscapeLiteral(string v)
 		static IList<IList<string>> _GetDysjunctions(
 			XbnfDocument d,
 			ICollection<string> syms,
-			IDictionary<XbnfExpression,string> tmap, 
-			IDictionary<string,XbnfAttributeList> attrs,
-			IList<KeyValuePair<string,IList<string>>> rules,
+			IDictionary<XbnfExpression, string> tmap,
+			IDictionary<string, XbnfAttributeList> attrs,
+			IList<KeyValuePair<string, IList<string>>> rules,
 			XbnfProduction p,
 			XbnfExpression e
 			)
 		{
 			var le = e as XbnfLiteralExpression;
-			if(null!=le)
+			if (null != le)
 			{
 				var res = new List<IList<string>>();
 				var l = new List<string>();
@@ -203,7 +203,7 @@ XbnfExpression e
 				return res;
 			}
 			var rfe = e as XbnfRefExpression;
-			if(null!=rfe)
+			if (null != rfe)
 			{
 				var res = new List<IList<string>>();
 				var l = new List<string>();
@@ -212,19 +212,19 @@ XbnfExpression e
 				return res;
 			}
 			var ce = e as XbnfConcatExpression;
-			if(null!=ce)
-				return _GetDysConcat(d, syms, tmap,attrs,rules, p, ce);
-			
+			if (null != ce)
+				return _GetDysConcat(d, syms, tmap, attrs, rules, p, ce);
+
 			var oe = e as XbnfOrExpression;
-			if(null!=oe)
-				return _GetDysOr(d, syms, tmap, attrs,rules,p, oe);
+			if (null != oe)
+				return _GetDysOr(d, syms, tmap, attrs, rules, p, oe);
 			var ope = e as XbnfOptionalExpression;
-			if(null!=ope)
+			if (null != ope)
 			{
 				return _GetDysOptional(d, syms, tmap, attrs, rules, p, ope);
 			}
 			var re = e as XbnfRepeatExpression;
-			if(null!=re)
+			if (null != re)
 				return _GetDysRepeat(d, syms, tmap, attrs, rules, p, re);
 			throw new NotSupportedException("The specified expression type is not supported.");
 		}
@@ -269,6 +269,7 @@ static IList<IList<string>> _GetDysRepeat(XbnfDocument d, ICollection<string> sy
 				++i;
 			}
 			syms.Add(ss);
+			listId = ss;
 			var attr = new XbnfAttribute("collapsed", true);
 			var attrlist = new XbnfAttributeList();
 			attrlist.Add(attr);
@@ -300,13 +301,13 @@ static IList<IList<string>> _GetDysRepeat(XbnfDocument d, ICollection<string> sy
 			}
 		}
 
-		static IList<IList<string>> _GetDysOr(XbnfDocument d, ICollection<string> syms, IDictionary<XbnfExpression, string> tmap, IDictionary<string,XbnfAttributeList> attrs,IList<KeyValuePair<string,IList<string>>> rules, XbnfProduction p, XbnfOrExpression oe)
+		static IList<IList<string>> _GetDysOr(XbnfDocument d, ICollection<string> syms, IDictionary<XbnfExpression, string> tmap, IDictionary<string, XbnfAttributeList> attrs, IList<KeyValuePair<string, IList<string>>> rules, XbnfProduction p, XbnfOrExpression oe)
 		{
 			var l = new List<IList<string>>();
 			if (null == oe.Left)
 				l.Add(new List<string>());
 			else
-				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs,rules,p,oe.Left))
+				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs, rules, p, oe.Left))
 					if (!l.Contains(ll, OrderedCollectionEqualityComparer<string>.Default))
 						l.Add(ll);
 			if (null == oe.Right)
@@ -316,7 +317,7 @@ static IList<IList<string>> _GetDysOr(XbnfDocument d, ICollection<string> syms,
 					l.Add(ll);
 			}
 			else
-				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs,rules,p, oe.Right))
+				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs, rules, p, oe.Right))
 					if (!l.Contains(ll, OrderedCollectionEqualityComparer<string>.Default))
 						l.Add(ll);
 			return l;
@@ -328,19 +329,19 @@ static IList<IList<string>> _GetDysConcat(XbnfDocument d, ICollection<string> sy
 			if (null == ce.Right)
 			{
 				if (null == ce.Left) return l;
-				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs,rules,p, ce.Left))
+				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs, rules, p, ce.Left))
 					l.Add(new List<string>(ll));
 				return l;
 			}
 			else if (null == ce.Left)
 			{
-				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs,rules,p, ce.Right))
+				foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs, rules, p, ce.Right))
 					l.Add(new List<string>(ll));
 				return l;
 			}
-			foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs,rules,p, ce.Left))
+			foreach (var ll in _GetDysjunctions(d, syms, tmap, attrs, rules, p, ce.Left))
 			{
-				foreach (var ll2 in _GetDysjunctions(d, syms, tmap, attrs,rules,p, ce.Right))
+				foreach (var ll2 in _GetDysjunctions(d, syms, tmap, attrs, rules, p, ce.Right))
 				{
 					var ll3 = new List<string>();
 					ll3.AddRange(ll);
@@ -352,9 +353,9 @@ static IList<IList<string>> _GetDysConcat(XbnfDocument d, ICollection<string> sy
 			return l;
 		}
 
-		static XbnfProduction _GetProductionForExpression(XbnfDocument d,XbnfExpression e)
+		static XbnfProduction _GetProductionForExpression(XbnfDocument d, XbnfExpression e)
 		{
-			for(int ic = d.Productions.Count,i=0;i<ic;++i)
+			for (int ic = d.Productions.Count, i = 0; i < ic; ++i)
 			{
 				var prod = d.Productions[i];
 				if (e == prod.Expression)
@@ -404,4 +405,4 @@ static void _VisitFetchTerminals(XbnfExpression expr, HashSet<XbnfExpression> te
 
 		}
 	}
-}
+}
\ No newline at end of file