Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 71267)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.dix	(revision 71269)
@@ -217,6 +217,7 @@
      <e r="LR"><p><l>ez<s n="prn"/><s n="pers"/><s n="p1"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p1"/></r></p></e>
      <e r="LR"><p><l>em<s n="prn"/><s n="pers"/><s n="p1"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p1"/></r></p></e>
      <e r="LR"><p><l>ew<s n="prn"/><s n="pers"/><s n="p3"/><s n="mf"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p3"/><s n="GD"/></r></p></e>
+     <e r="LR"><p><l>ew<s n="prn"/><s n="pers"/><s n="p3"/><s n="m"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p3"/><s n="GD"/></r></p></e>
      <e r="LR"><p><l>tu<s n="prn"/><s n="pers"/><s n="p2"/><s n="mf"/><s n="sg"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p2"/><s n="mf"/><s n="sp"/></r></p></e>
      <e r="LR"><p><l>tu<s n="prn"/><s n="pers"/><s n="p2"/><s n="mf"/><s n="pl"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p2"/><s n="mf"/><s n="sp"/></r></p></e>
      <e r="LR"><p><l>hûn<s n="prn"/><s n="pers"/><s n="p2"/></l><r>prpers<s n="prn"/><s n="FD"/><s n="p2"/></r></p></e>
@@ -294,6 +295,7 @@
      <e><p><l>hevgirtin<s n="n"/><s n="f"/></l><r>unification<s n="n"/></r></p></e>
      <e><p><l>berx<s n="n"/><s n="f"/></l><r>sheep<s n="n"/></r></p></e>
      <e><p><l>berx<s n="n"/><s n="m"/></l><r>sheep<s n="n"/></r></p></e>
+     <e><p><l>hukm<s n="n"/><s n="m"/></l><r>verdict<s n="n"/></r></p></e>
      <e><p><l>cemser<s n="n"/><s n="m"/></l><r>pole<s n="n"/></r></p></e>
      <e><p><l>dergeh<s n="n"/><s n="f"/></l><r>shrine<s n="n"/></r></p></e>
      <e><p><l>dergeh<s n="n"/><s n="f"/></l><r>gate<s n="n"/></r></p></e>
@@ -5062,7 +5064,7 @@
       <e><p><l>hezare<s n="n"/><s n="f"/></l><r>millennium<s n="n"/></r></p></e>
       <e><p><l>hezarsal<s n="n"/><s n="f"/></l><r>millennium<s n="n"/></r></p></e>
       <e><p><l>hezim<s n="n"/><s n="f"/></l><r>digestion<s n="n"/></r></p></e>
-      <e><p><l>hêz<s n="n"/><s n="f"/></l><r>power<s n="n"/></r></p></e>
+      <e><p><l>hêz<s n="n"/><s n="f"/></l><r>force<s n="n"/></r></p></e>
       <e><p><l>hêz<s n="n"/><s n="f"/></l><r>strength<s n="n"/></r></p></e>
       <e><p><l>hicûm<s n="n"/><s n="f"/></l><r>attack<s n="n"/></r></p></e>
       <e><p><l>hidûd<s n="n"/><s n="m"/></l><r>border<s n="n"/></r></p></e>
@@ -11328,6 +11330,7 @@
       <e><p><l>Salih<s n="np"/><s n="ant"/><s n="m"/></l><r>Salih<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Mesûd<s n="np"/><s n="ant"/><s n="m"/></l><r>Masoud<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Barzanî<s n="np"/><s n="ant"/><s n="m"/></l><r>Barzani<s n="np"/><s n="ant"/></r></p></e>
+      <e><p><l>Wanlî<s n="np"/><s n="ant"/><s n="m"/></l><r>Wanli<s n="np"/><s n="ant"/></r></p></e>
       <e><p><l>Tîrêj<s n="np"/><s n="al"/><s n="f"/></l><r>Tîrêj<s n="np"/><s n="al"/></r></p></e>
 
      <!-- SECTION: Adjectives -->
@@ -11335,6 +11338,7 @@
      <e><p><l>reformxwaz<s n="adj"/></l><r>reformist<s n="adj"/></r></p></e>
      <e><p><l>taktîkî<s n="adj"/></l><r>tactical<s n="adj"/></r></p></e>
      <e><p><l>teqez<s n="adj"/></l><r>valid<s n="adj"/></r></p></e>
+     <e><p><l>xeyabî<s n="adj"/></l><r>in<b/>absentia<s n="adv"/></r></p></e>
      <e><p><l>şûnde<s n="adj"/></l><r>late<s n="adj"/></r></p></e>
      <e><p><l>teqez<s n="adj"/></l><r>right<s n="adj"/></r></p></e>
      <e><p><l>teqez<s n="adj"/></l><r>true<s n="adj"/></r></p></e>
@@ -15180,6 +15184,8 @@
      <e><p><l>gihîştin<s n="vblex"/><s n="iv"/></l><r>ripen<s n="vblex"/></r></p></e>
      <e><p><l>teqezbûn<s n="vblex"/><s n="iv"/></l><r>be<b/>verified<s n="vblex"/></r></p></e>
      <e><p><l>teqez<b/>kirin<s n="vblex"/><s n="tv"/></l><r>verify<s n="vblex"/></r></p></e>
+     <e><p><l>hewldan<s n="vblex"/><s n="tv"/></l><r>try<s n="vblex"/></r></p></e>
+     <e><p><l>hewldan<s n="vblex"/><s n="tv"/></l><r>attempt<s n="vblex"/></r></p></e>
      <e><p><l>rabûn<s n="vblex"/><s n="tv"/></l><r>wake<b/>up<s n="vblex"/></r></p></e>
      <e><p><l>ragihandin<s n="vblex"/><s n="tv"/></l><r>report<s n="vblex"/></r></p></e>
      <e><p><l>lêxistin<s n="vblex"/><s n="tv"/></l><r>beat<s n="vblex"/></r></p></e>
@@ -15501,6 +15507,7 @@
       <e><p><l>qewimin<s n="vblex"/><s n="iv"/></l><r>form<s n="vblex"/></r></p></e>
 
       <e><p><l>çûn<s n="vblex"/><s n="iv"/></l><r>go<s n="vblex"/></r></p></e>
+      <e><p><l>derçûn<s n="vblex"/><s n="iv"/></l><r>come<b/>out<s n="vblex"/></r></p></e>
 
       <e><p><l>hatin<s n="vblex"/><s n="iv"/></l><r>come<s n="vblex"/></r></p></e>
 
Index: incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.lrx
===================================================================
--- incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.lrx	(revision 71267)
+++ incubator/apertium-kmr-eng/apertium-kmr-eng.kmr-eng.lrx	(revision 71269)
@@ -15,10 +15,16 @@
 
   <rule weight="1.0">
     <match lemma="ji" tags="pr"><select lemma="from" tags="pr"/></match>
-    <match lemma="*" tags="np.top.*"/>  
+    <match tags="np.top.*"/>  
 </rule>
 
+
   <rule weight="1.0">
+    <match lemma="ji" tags="pr"><select lemma="from" tags="pr"/></match>
+    <match tags="n.*"/>  
+</rule>
+
+  <rule weight="1.0">
     <match lemma="ji" tags="pr"><select lemma="to" tags="pr"/></match>
     <or><match tags="n.*"/><match tags="prn.*"/></or>
     <match lemma="re" tags="post"/>
Index: incubator/apertium-kmr/apertium-kmr.kmr.dix
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71267)
+++ incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71269)
@@ -262,6 +262,12 @@
       <e r="LR"><p><l><b/>dê</l><r><j/>dê<s n="fut"/></r></p></e>
     </pardef>
 
+
+    <pardef n="S__dê__enc">
+      <e><p><l/><r/></p></e>
+      <e r="LR"><p><l><b/>dê</l><r><j/>dê<s n="fut"/></r></p></e>
+    </pardef>
+
     <pardef n="/ez__prn">
       <e><p><l>ez</l><r>ez<s n="prn"/><s n="pers"/><s n="p1"/><s n="mf"/><s n="sg"/><s n="nom"/></r></p><par n="S__ê_dê__enc"/></e>
       <e><p><l>min</l><r>ez<s n="prn"/><s n="pers"/><s n="p1"/><s n="mf"/><s n="sg"/><s n="obl"/></r></p></e>
@@ -274,6 +280,8 @@
 
     <pardef n="ew__prn">
       <e><p><l>ew</l><r>ew<s n="prn"/><s n="pers"/><s n="p3"/><s n="mf"/><s n="sg"/><s n="nom"/></r></p><par n="S__ê_dê__enc"/></e>
+      <e><p><l>wî</l><r>ew<s n="prn"/><s n="pers"/><s n="p3"/><s n="m"/><s n="sg"/><s n="obl"/></r></p><par n="S__dê__enc"/></e>
+      <e><p><l>wê</l><r>ew<s n="prn"/><s n="pers"/><s n="p3"/><s n="f"/><s n="sg"/><s n="obl"/></r></p><par n="S__dê__enc"/></e>
     </pardef>
 
     <pardef n="/em__prn">
@@ -571,7 +579,7 @@
       <e><p><l>ekê</l><r><s n="n"/><s n="f"/><s n="sg"/><s n="obl"/><s n="ind"/></r></p></e>
       <e><p><l>eke</l><r><s n="n"/><s n="f"/><s n="sg"/><s n="con"/><s n="ind"/></r></p></e>
       <e><p><l></l><r><s n="n"/><s n="f"/><s n="pl"/><s n="nom"/><s n="def"/></r></p></e>
-      <e><p><l>ên</l><r><s n="n"/><s n="f"/><s n="pl"/><s n="obl"/><s n="def"/></r></p></e>
+      <e><p><l>ên</l><r><s n="n"/><s n="f"/><s n="pl"/><s n="con"/><s n="def"/></r></p></e>
       <e><p><l>an</l><r><s n="n"/><s n="f"/><s n="pl"/><s n="obl"/><s n="def"/></r></p></e>
       <e><p><l>ên</l><r><s n="n"/><s n="f"/><s n="pl"/><s n="voc"/><s n="def"/></r></p></e>
       <e><p><l>in</l><r><s n="n"/><s n="f"/><s n="pl"/><s n="nom"/><s n="ind"/></r></p></e>
@@ -929,6 +937,7 @@
         <e><p><l>a</l><r><s n="vblex"/><s n="tv"/><s n="past"/><s n="p3"/><s n="sg"/></r></p></e>
         <e><p><l>aye</l><r><s n="vblex"/><s n="tv"/><s n="narr"/><s n="p3"/><s n="sg"/></r></p></e>
         <e><p><l>in</l><r><s n="vblex"/><s n="tv"/><s n="past"/><s n="p3"/><s n="pl"/></r></p></e>
+        <e><p><l>an</l><r><s n="vblex"/><s n="tv"/><s n="past"/><s n="p3"/><s n="pl"/></r></p></e>
         <e><p><l><b/>bû</l><r><s n="vblex"/><s n="tv"/><s n="plu"/><s n="p3"/><s n="sg"/></r></p></e>
         <e><p><l><b/>bûn</l><r><s n="vblex"/><s n="tv"/><s n="plu"/><s n="p3"/><s n="pl"/></r></p></e>
     </pardef>
@@ -2329,6 +2338,7 @@
     
     <!-- New Masculines -->
     <e lm="berx"><i>berx</i><par n="mirov__n_m"/></e>
+    <e lm="hukm"><i>hukm</i><par n="mirov__n_m"/></e>
     <e lm="asl"><i>asl</i><par n="mirov__n_m"/></e>
     <e lm="keya"><i>key</i><par n ="çiy/a__n_m"/></e>
     <e lm="kol"><i>kol</i><par n="mirov__n_m"/></e>
@@ -14815,6 +14825,7 @@
     <e lm="Mihemed"><i>Mihemed</i><par n="Salih__np"/></e>
     <e lm="Mesûd"><i>Mesûd</i><par n="Salih__np"/></e>
     <e lm="Barzanî"><i>Barzan</i><par n="Barzan/î__np"/></e>
+    <e lm="Wanlî"><i>Wanl</i><par n="Barzan/î__np"/></e>
     <e lm="Tîrêj"><i>Tîrêj</i><par n="Tîrêj__np"/></e>
 
     <!-- SECTION: Preadverbs -->
@@ -14827,11 +14838,13 @@
     <e lm="neteweperest"><i>neteweperes</i><par n="pêwis/t__adj"/></e>
     <e lm="reformxwaz"><i>reformxwaz</i><par n="germ__adj"/></e>
     <e lm="taktîkî"><i>taktîk</i><par n="navend/î__adj"/></e>
+    <e lm="xeyabî"><i>xeyab</i><par n="navend/î__adj"/></e>
     <e lm="teqez"><i>teqez</i><par n="germ__adj"/></e>
     <e lm="berdar"><i>berdar</i><par n="germ__adj"/></e>
     <e lm="binax"><i>binax</i><par n="germ__adj"/></e>
     <e lm="tirşîn"><i>tirşîn</i><par n="germ__adj"/></e>
     <e lm="ketî"><i>ket</i><par n="navend/î__adj"/></e>
+    <e lm="giyabî"><i>giyab</i><par n="navend/î__adj"/></e>
     <e lm="livok"><i>livok</i><par n="germ__adj"/></e>
     <e lm="girêdayî"><i>girêday</i><par n="navend/î__adj"/></e>
     <e lm="kelh"><i>kelh</i><par n="germ__adj"/></e>
@@ -15934,6 +15947,18 @@
     <e lm="dengdan"><p><l>dengned</l><r>dengdan</r></p><par n="ned/an_vblex_tv"/></e>
     <e lm="dengdan"><p><l>dengnad</l><r>dengdan</r></p><par n="nak/e__vblex_tv"/></e>
 
+        <!-- hewldan; ; hewlda; hewl..d -->
+    <e lm="hewldan"><p><l>hewld</l><r>hewldan</r></p><par n="d/an_vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewldid</l><r>hewldan</r></p><par n="did/an__vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewlbid</l><r>hewldan</r></p><par n="bid/an__vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewlned</l><r>hewldan</r></p><par n="ned/an_vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewlnad</l><r>hewldan</r></p><par n="nak/e__vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewl<b/>d</l><r>hewldan</r></p><par n="d/an_vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewl<b/>did</l><r>hewldan</r></p><par n="did/an__vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewl<b/>bid</l><r>hewldan</r></p><par n="bid/an__vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewl<b/>ned</l><r>hewldan</r></p><par n="ned/an_vblex_tv"/></e>
+    <e lm="hewldan"><p><l>hewl<b/>nad</l><r>hewldan</r></p><par n="nak/e__vblex_tv"/></e>
+
         <!-- dengkirin; ; dengkir; deng..k -->
     <e lm="dengkirin"><p><l>dengkir</l><r>dengkirin</r></p><par n="kir/__vblex_tv"/></e>
     <e lm="dengkirin"><p><l>dengdik</l><r>dengkirin</r></p><par n="dik/e__vblex_tv"/></e>
@@ -16365,6 +16390,14 @@
     <e lm="çûn"><p><l>naçû</l><r>çûn</r></p><par n="neçû/n__vblex_iv"/></e>
     <e lm="çûn"><p><l>diçû</l><r>çûn</r></p><par n="diçû/n__vblex_iv"/></e>
 
+        <!-- derçû ; derçû derdiç -->
+    <e lm="derçûn"><p><l>derdiç</l><r>derçûn</r></p><par n="diaxiv/e__vblex_iv"/></e>
+    <e lm="derçûn"><p><l>derbiç</l><r>derçûn</r></p><par n="biaxiv/e__vblex_iv"/></e>
+    <e lm="derçûn"><p><l>derçû</l><r>derçûn</r></p><par n="çû/n__vblex_iv"/></e>
+    <e lm="derçûn"><p><l>derneçû</l><r>derçûn</r></p><par n="neçû/n__vblex_iv"/></e>
+    <e lm="derçûn"><p><l>dernaçû</l><r>derçûn</r></p><par n="neçû/n__vblex_iv"/></e>
+    <e lm="derçûn"><p><l>derdiçû</l><r>derçûn</r></p><par n="diçû/n__vblex_iv"/></e>
+
         <!-- dihewandin; ; dihewand; dihewîn -->
     <e lm="dihewandin"><p><l>dihewand</l><r>dihewandin</r></p><par n="kir/__vblex_tv"/></e>
     <e lm="dihewandin"><p><l>didihewîn</l><r>dihewandin</r></p><par n="dik/e__vblex_tv"/></e>
Index: incubator/apertium-kmr/apertium-kmr.kmr.rlx
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71267)
+++ incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71269)
@@ -5,6 +5,7 @@
 
 LIST N = n ;
 LIST Prop = np ;
+LIST Ant = ant;
 LIST Pron = prn ;
 LIST V = vaux vblex vbser vbcop ;
 LIST Adv = adv ;
@@ -38,6 +39,7 @@
 LIST Aux = vaux ;
 LIST CS = cnjsub ;
 LIST Pers = pers ;
+LIST Rel = rel ;
 
 LIST Past = past ;
 LIST Fut = fut ;
@@ -44,6 +46,9 @@
 LIST Prs = prs ; 
 LIST BI = "bi" ;
 LIST SPEECH-VERB = "axaftin" ;
+LIST DO-VERB = "kirin";
+LIST BUY-VERB = "kirîn";
+LIST TEACHER = "mamoste";
 LIST LANG = "kurdî" ;
 LIST VE = "ve" ;
 LIST Bûn = "bûn" ; 
@@ -73,7 +78,7 @@
 LIST Gelek = "gelek" ;
 LIST Ko = "<ko>"i ;
 
-LIST Fin = pri prs ; # Complete
+LIST Fin = pri past fut narr ; # Complete
 
 SET NOMEN = N | Prop ;
 
@@ -85,6 +90,10 @@
 
 SECTION
 
+SELECT Nom IF (0 TEACHER) (1 Ant); 
+
+SELECT Sg IF (0 N + Nom) (0 Sg OR Pl) (1 Ant);
+
 SELECT HETA IF (0 HETA OR Eza) ;
 
 REMOVE Voc IF (0 Voc OR Obl) (-1 Eza) ;
@@ -153,10 +162,20 @@
 
 SELECT Pl IF (0 N + Pl OR N + Pl) (1 TV + Past + Pl);
 
-SELECT P3 IF (0 P1 OR P2 OR P3) (NOT -1 Pron);
+SELECT P3 IF (0 P1 OR P2 OR P3) (NOT -1* Pron + P1) (NOT -1* Pron + P2);
 
 SELECT Cop IF (0 Aux OR Cop) (-1 Pron);
 
+SELECT DO-VERB IF (0 DO-VERB OR BUY-VERB);
+
+REMOVE Voc IF (0 Obl OR Voc) (-1 Eza);
+
+SELECT Eza IF (0 Eza OR Voc) (1 Obl);
+
+SELECT CS IF (0 CS OR Pron + Rel) (1* Prs);
+
+SELECT Prs IF (-1* CS LINK -1* Fin);
+
 SECTION
 
 LIST @nsubj = @nsubj ;