diff --git a/examples/animals/QuestionsI.gf b/examples/animals/QuestionsI.gf
index 8da5aa678..4373103e8 100644
--- a/examples/animals/QuestionsI.gf
+++ b/examples/animals/QuestionsI.gf
@@ -10,18 +10,18 @@ incomplete concrete QuestionsI of Questions = open Syntax in {
 
   lin 
     Who  love_V2 man_N           = (
-mkUtt ((mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 4.548068040131532e-11
+mkUtt (mkQCl    (mkQCl whoSg_IP (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 4.548068040131532e-11
 )
  ;
     Whom man_N love_V2           = (
 --- WARNING: ambiguous example whom does the man love
-mkUtt (mkQCl whoPl_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2)))  -- 2.8425425250822075e-11
+mkUtt (mkQCl    (mkQCl whoPl_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2))))  -- 2.8425425250822075e-11
   --- mkUtt (mkQCl    (mkQCl whoSg_IP (mkClSlash (mkNP the_Art  man_N) (mkVPSlash love_V2))))  -- 2.8425425250822075e-11
 )
  ;
     Answer woman_N love_V2 man_N = (
 --- WARNING: ambiguous example the woman loves men
-mkUtt (mkCl    (mkNP the_Art  woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N)))  -- 3.273034657650043e-14
+mkUtt (mkCl    (mkCl (mkNP the_Art  woman_N) (mkVP (mkVPSlash love_V2) (mkNP a_Art plNum man_N))))  -- 3.273034657650043e-14
   --- mkUtt (mkNP the_Art  (mkCN (mkCN (mkCN woman_N) (mkNP a_Art plNum love_N)) (mkNP a_Art plNum man_N)))  -- 1.6623594622841657e-20
   --- mkUtt (mkNP the_Art  (mkCN (mkCN woman_N) (mkNP a_Art plNum (mkCN (mkCN love_N) (mkNP a_Art plNum man_N)))))  -- 1.6623594622841657e-20
 )
diff --git a/lib/doc/synopsis.html b/lib/doc/synopsis.html
index c1cbbecab..397838eed 100644
--- a/lib/doc/synopsis.html
+++ b/lib/doc/synopsis.html
@@ -166,7 +166,7 @@ of <I>C</I> that takes <I>D</I> as an argument. What the constructors exactly ar
 and what other arguments they take, is described by separate tables for
 each category.
 </P>
-<TABLE ALIGN="center" BORDER="1" CELLPADDING="4">
+<TABLE ALIGN="center" CELLPADDING="4" BORDER="1">
 <TR>
 <TD ALIGN="right"><center><IMG ALIGN="middle" SRC="categories.png" USEMAP="#categories" BORDER="0" ALT=""></center></TD>
 </TR>
@@ -231,7 +231,7 @@ also in the <CODE>Paradigms</CODE> modules.
 </P>
 <A NAME="toc4"></A>
 <H2>Explanations</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Category</TH>
 <TH>Explanation</TH>
@@ -576,7 +576,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="AP"></A>
 <H2>AP - adjectival phrase</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -666,7 +666,7 @@ Lexical category, constructors given in
 
 <A NAME="AdA"></A>
 <H2>AdA - adjective-modifying adverb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -701,7 +701,7 @@ Lexical category, constructors given in
 
 <A NAME="AdN"></A>
 <H2>AdN - numeral-modifying adverb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -731,7 +731,7 @@ Lexical category, constructors given in
 
 <A NAME="AdV"></A>
 <H2>AdV - adverb directly attached to verb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -746,7 +746,7 @@ Lexical category, constructors given in
 
 <A NAME="Adv"></A>
 <H2>Adv - verb-phrase-modifying adverb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -836,7 +836,7 @@ Lexical category, constructors given in
 
 <A NAME="Ant"></A>
 <H2>Ant - anteriority</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -856,7 +856,7 @@ Lexical category, constructors given in
 
 <A NAME="CAdv"></A>
 <H2>CAdv - comparative adverb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -881,7 +881,7 @@ Lexical category, constructors given in
 
 <A NAME="CN"></A>
 <H2>CN - common noun (without determiner)</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -986,7 +986,7 @@ Lexical category, constructors given in
 
 <A NAME="Card"></A>
 <H2>Card - cardinal number</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1016,7 +1016,7 @@ Lexical category, constructors given in
 
 <A NAME="Cl"></A>
 <H2>Cl - declarative clause, with all tenses</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1171,7 +1171,7 @@ Lexical category, constructors given in
 
 <A NAME="ClSlash"></A>
 <H2>ClSlash</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1211,7 +1211,7 @@ Lexical category, constructors given in
 
 <A NAME="Comp"></A>
 <H2>Comp - complement of copula, such as AP</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1236,7 +1236,7 @@ Lexical category, constructors given in
 
 <A NAME="Conj"></A>
 <H2>Conj - conjunction</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1271,7 +1271,7 @@ Lexical category, constructors given in
 
 <A NAME="Det"></A>
 <H2>Det - determiner phrase</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1391,7 +1391,7 @@ Lexical category, constructors given in
 
 <A NAME="Dig"></A>
 <H2>Dig</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1451,7 +1451,7 @@ Lexical category, constructors given in
 
 <A NAME="Digits"></A>
 <H2>Digits - cardinal or ordinal in digits</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1476,7 +1476,7 @@ Lexical category, constructors given in
 
 <A NAME="IAdv"></A>
 <H2>IAdv - interrogative adverb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1527,7 +1527,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="IDet"></A>
 <H2>IDet - interrogative determiner</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1562,7 +1562,7 @@ Lexical category, constructors given in
 
 <A NAME="IP"></A>
 <H2>IP - interrogative pronoun</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1637,7 +1637,7 @@ Lexical category, constructors given in
 
 <A NAME="IQuant"></A>
 <H2>IQuant</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1652,7 +1652,7 @@ Lexical category, constructors given in
 
 <A NAME="Imp"></A>
 <H2>Imp - imperative</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1677,7 +1677,7 @@ Lexical category, constructors given in
 
 <A NAME="ImpForm"></A>
 <H2>ImpForm</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1708,7 +1708,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="ListAP"></A>
 <H2>ListAP</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1728,7 +1728,7 @@ Lexical category, constructors given in
 
 <A NAME="ListAdv"></A>
 <H2>ListAdv</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1748,7 +1748,7 @@ Lexical category, constructors given in
 
 <A NAME="ListNP"></A>
 <H2>ListNP</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1768,7 +1768,7 @@ Lexical category, constructors given in
 
 <A NAME="ListRS"></A>
 <H2>ListRS</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1788,7 +1788,7 @@ Lexical category, constructors given in
 
 <A NAME="ListS"></A>
 <H2>ListS</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -1826,7 +1826,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="NP"></A>
 <H2>NP - noun phrase (subject or object)</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2001,7 +2001,7 @@ Lexical category, constructors given in
 
 <A NAME="Num"></A>
 <H2>Num - number determining element</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2051,7 +2051,7 @@ Lexical category, constructors given in
 
 <A NAME="Numeral"></A>
 <H2>Numeral - cardinal or ordinal in words</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2081,7 +2081,7 @@ Lexical category, constructors given in
 
 <A NAME="Ord"></A>
 <H2>Ord - ordinal number (used in Det)</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2111,7 +2111,7 @@ Lexical category, constructors given in
 
 <A NAME="PConj"></A>
 <H2>PConj - phrase-beginning conjunction</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2147,7 +2147,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="Phr"></A>
 <H2>Phr - phrase in a text</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2182,7 +2182,7 @@ Lexical category, constructors given in
 
 <A NAME="Pol"></A>
 <H2>Pol - polarity</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2202,7 +2202,7 @@ Lexical category, constructors given in
 
 <A NAME="Predet"></A>
 <H2>Predet - predeterminer (prefixed Quant)</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2232,7 +2232,7 @@ Lexical category, constructors given in
 
 <A NAME="Prep"></A>
 <H2>Prep - preposition, or just case</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2347,7 +2347,7 @@ Lexical category, constructors given in
 
 <A NAME="Pron"></A>
 <H2>Pron - personal pronoun</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2402,7 +2402,7 @@ Lexical category, constructors given in
 
 <A NAME="Punct"></A>
 <H2>Punct</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2427,7 +2427,7 @@ Lexical category, constructors given in
 
 <A NAME="QCl"></A>
 <H2>QCl - question clause, with all tenses</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2577,7 +2577,7 @@ Lexical category, constructors given in
 
 <A NAME="QS"></A>
 <H2>QS - question</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2597,7 +2597,7 @@ Lexical category, constructors given in
 
 <A NAME="Quant"></A>
 <H2>Quant - quantifier ('nucleus' of Det)</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2637,7 +2637,7 @@ Lexical category, constructors given in
 
 <A NAME="RCl"></A>
 <H2>RCl - relative clause, with all tenses</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2667,7 +2667,7 @@ Lexical category, constructors given in
 
 <A NAME="RP"></A>
 <H2>RP - relative pronoun</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2687,7 +2687,7 @@ Lexical category, constructors given in
 
 <A NAME="RS"></A>
 <H2>RS - relative</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2712,7 +2712,7 @@ Lexical category, constructors given in
 
 <A NAME="S"></A>
 <H2>S - declarative sentence</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2742,7 +2742,7 @@ Lexical category, constructors given in
 
 <A NAME="SC"></A>
 <H2>SC - embedded sentence or question</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2767,7 +2767,7 @@ Lexical category, constructors given in
 
 <A NAME="SSlash"></A>
 <H2>SSlash</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2782,7 +2782,7 @@ Lexical category, constructors given in
 
 <A NAME="Sub100"></A>
 <H2>Sub100</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2807,7 +2807,7 @@ Lexical category, constructors given in
 
 <A NAME="Sub1000"></A>
 <H2>Sub1000</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2832,7 +2832,7 @@ Lexical category, constructors given in
 
 <A NAME="Subj"></A>
 <H2>Subj - subjunction</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2873,7 +2873,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="Tense"></A>
 <H2>Tense - tense</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2903,7 +2903,7 @@ Lexical category, constructors given in
 
 <A NAME="Text"></A>
 <H2>Text - text consisting of several phrases</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -2953,7 +2953,7 @@ Lexical category, constructors given in
 
 <A NAME="Unit"></A>
 <H2>Unit</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3008,7 +3008,7 @@ Lexical category, constructors given in
 
 <A NAME="Utt"></A>
 <H2>Utt - sentence, question, word...</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3104,7 +3104,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="V2"></A>
 <H2>V2 - two-place verb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3155,7 +3155,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="VP"></A>
 <H2>VP - verb phrase</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3305,7 +3305,7 @@ Lexical category, constructors given in
 
 <A NAME="VPSlash"></A>
 <H2>VPSlash - verb phrase missing complement</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3367,7 +3367,7 @@ Lexical category, constructors given in
 </P>
 <A NAME="VV"></A>
 <H2>VV - verb-phrase-complement verb</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3397,7 +3397,7 @@ Lexical category, constructors given in
 
 <A NAME="Voc"></A>
 <H2>Voc - vocative or "please"</H2>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH>Type</TH>
@@ -3425,7 +3425,7 @@ Lexical category, constructors given in
 <P>
 source <A HREF="../src/bulgarian/ParadigmsBul.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/bulgarian/ParadigmsBul.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -4116,7 +4116,7 @@ source <A HREF="../src/bulgarian/ParadigmsBul.gf"><CODE>http://www.grammaticalfr
 <P>
 source <A HREF="../src/catalan/ParadigmsCat.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/catalan/ParadigmsCat.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -4351,7 +4351,7 @@ source <A HREF="../src/catalan/ParadigmsCat.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/danish/ParadigmsDan.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/danish/ParadigmsDan.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -4602,7 +4602,7 @@ source <A HREF="../src/danish/ParadigmsDan.gf"><CODE>http://www.grammaticalframe
 <P>
 source <A HREF="../src/dutch/ParadigmsDut.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/dutch/ParadigmsDut.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -4885,7 +4885,7 @@ source <A HREF="../src/dutch/ParadigmsDut.gf"><CODE>http://www.grammaticalframew
 <P>
 source <A HREF="../src/english/ParadigmsEng.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/english/ParadigmsEng.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -5232,7 +5232,7 @@ source <A HREF="../src/english/ParadigmsEng.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/finnish/ParadigmsFin.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/finnish/ParadigmsFin.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -5511,7 +5511,7 @@ source <A HREF="../src/finnish/ParadigmsFin.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/french/ParadigmsFre.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/french/ParadigmsFre.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -5750,7 +5750,7 @@ source <A HREF="../src/french/ParadigmsFre.gf"><CODE>http://www.grammaticalframe
 <P>
 source <A HREF="../src/german/ParadigmsGer.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/german/ParadigmsGer.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -6049,7 +6049,7 @@ source <A HREF="../src/german/ParadigmsGer.gf"><CODE>http://www.grammaticalframe
 <P>
 source <A HREF="../src/italian/ParadigmsIta.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/italian/ParadigmsIta.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -6288,7 +6288,7 @@ source <A HREF="../src/italian/ParadigmsIta.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/norwegian/ParadigmsNor.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/norwegian/ParadigmsNor.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -6539,7 +6539,7 @@ source <A HREF="../src/norwegian/ParadigmsNor.gf"><CODE>http://www.grammaticalfr
 <P>
 source <A HREF="../src/polish/ParadigmsPol.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/polish/ParadigmsPol.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -7146,7 +7146,7 @@ source <A HREF="../src/polish/ParadigmsPol.gf"><CODE>http://www.grammaticalframe
 <P>
 source <A HREF="../src/romanian/ParadigmsRon.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/romanian/ParadigmsRon.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -7297,7 +7297,7 @@ source <A HREF="../src/romanian/ParadigmsRon.gf"><CODE>http://www.grammaticalfra
 <P>
 source <A HREF="../src/russian/ParadigmsRus.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/russian/ParadigmsRus.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -7440,7 +7440,7 @@ source <A HREF="../src/russian/ParadigmsRus.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/spanish/ParadigmsSpa.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/spanish/ParadigmsSpa.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -7679,7 +7679,7 @@ source <A HREF="../src/spanish/ParadigmsSpa.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/swedish/ParadigmsSwe.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/swedish/ParadigmsSwe.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -7930,7 +7930,7 @@ source <A HREF="../src/swedish/ParadigmsSwe.gf"><CODE>http://www.grammaticalfram
 <P>
 source <A HREF="../src/urdu/ParadigmsUrd.gf"><CODE>http://www.grammaticalframework.org/lib/resource/src/urdu/ParadigmsUrd.gf</CODE></A>
 </P>
-<TABLE BORDER="1" CELLPADDING="4">
+<TABLE CELLPADDING="4" BORDER="1">
 <TR>
 <TH>Function</TH>
 <TH COLSPAN="2">Type</TH>
@@ -8205,6 +8205,6 @@ For each language, an instantiation of the functor:
 </PRE>
 <P></P>
 
-<!-- html code generated by txt2tags 2.5 (http://txt2tags.sf.net) -->
+<!-- html code generated by txt2tags 2.4 (http://txt2tags.sf.net) -->
 <!-- cmdline: txt2tags -thtml -\-toc synopsis.txt -->
 </BODY></HTML>
diff --git a/lib/src/api/Constructors.gf b/lib/src/api/Constructors.gf
index 63494b2f0..a222f107b 100644
--- a/lib/src/api/Constructors.gf
+++ b/lib/src/api/Constructors.gf
@@ -1023,7 +1023,7 @@ incomplete resource Constructors = open Grammar in {  --%
 
       mkAP : Ord   -> AP              -- oldest 
       = AdjOrd ; --%
-      mkAP : CAdv -> AP -> NP -> AP  -- as old as John
+      mkAP : CAdv -> AP -> NP -> AP   -- as old as John
       = CAdvAP ; --%
       } ; --% 
 
diff --git a/lib/src/hindustani/VerbHindustani.gf b/lib/src/hindustani/VerbHindustani.gf
index 2d50a475e..ab49317ba 100644
--- a/lib/src/hindustani/VerbHindustani.gf
+++ b/lib/src/hindustani/VerbHindustani.gf
@@ -36,6 +36,7 @@ incomplete concrete VerbHindustani of Verb = CatHindustani ** open CommonHindust
     CompAP ap ={s = \\a => ap.s ! giveNumber a ! giveGender a ! Dir ! Posit } ;
     CompNP np = {s = \\_ => np.s ! NPObj} ;
     CompAdv adv = {s = \\a => adv.s ! giveGender a} ;
+    CompCN cn = {s = \\a => cn.s ! giveNumber a ! Dir} ;
 
 
 }
diff --git a/lib/src/punjabi/VerbPnb.gf b/lib/src/punjabi/VerbPnb.gf
index 9041a937b..71fa1626a 100644
--- a/lib/src/punjabi/VerbPnb.gf
+++ b/lib/src/punjabi/VerbPnb.gf
@@ -40,6 +40,7 @@ concrete VerbPnb of Verb = CatPnb ** open ResPnb in {
     CompAP ap ={s = \\a => ap.s ! giveNumber a ! giveGender a ! Dir } ;
     CompNP np = {s = \\_ => np.s ! NPObj} ;
     CompAdv adv = {s = \\a => adv.s ! (fromAgr a).g } ;
+    CompCN cn = {s = \\a => cn.s ! giveNumber a ! Dir} ;
 
 
 }