Index: incubator/apertium-kmr/apertium-kmr.kmr.dix
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71827)
+++ incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71828)
@@ -891,6 +891,16 @@
       <e><p><l>ê</l><r><s n="adj"/><s n="pst"/><s n="con"/></r></p></e>
     </pardef>
 
+    <pardef n="dewlemen/d__adj">
+      <e><p><l>d</l><r>d<s n="adj"/><s n="pst"/></r></p></e>
+      <e><p><l>tir</l><r>d<s n="adj"/><s n="comp"/></r></p></e>
+      <e><p><l>tirîn</l><r>d<s n="adj"/><s n="sup"/></r></p></e>
+      <e><p><l>da</l><r>d<s n="adj"/><s n="pst"/><s n="con"/></r></p></e>
+      <e><p><l>dê</l><r>d<s n="adj"/><s n="pst"/><s n="con"/></r></p></e>
+    </pardef>
+
+
+
     <pardef n="pêwis/t__adj">
       <e><p><l>t</l><r>t<s n="adj"/><s n="pst"/></r></p></e>
       <e><p><l>tir</l><r>t<s n="adj"/><s n="comp"/></r></p></e>
@@ -927,7 +937,7 @@
         <e><p><l>î</l><r><s n="p2"/><s n="sg"/></r></p></e>
         <e><p><l>e</l><r><s n="p3"/><s n="sg"/></r></p></e>
         <e><p><l></l><r><s n="p3"/><s n="sg"/></r></p></e>
-        <e><p><l>in</l><r><s n="p1"/><s n="pl"/></r></p></e>
+<!--        <e><p><l>in</l><r><s n="p1"/><s n="pl"/></r></p></e>-->
         <e><p><l>in</l><r><s n="p2"/><s n="pl"/></r></p></e>
         <e><p><l>in</l><r><s n="p3"/><s n="pl"/></r></p></e>
     </pardef> 
@@ -1109,10 +1119,16 @@
         <e><p><l>iya<b/>bû</l><r><s n="vblex"/><s n="plu"/><s n="p3"/><s n="sg"/></r></p></e>
     </pardef> 
 
-    <pardef n="kir/__vblex">
+    <pardef n="kir/__vblex"> 
+        <e><p><l>im</l><r><s n="past"/><s n="p1"/><s n="sg"/></r></p></e>
+        <e><p><l>î</l><r><s n="past"/><s n="p2"/><s n="sg"/></r></p></e>
+        <e><p><l></l><r><s n="past"/><s n="p3"/><s n="sg"/></r></p></e>
+        <e><p><l>in</l><r><s n="past"/><s n="p1"/><s n="pl"/></r></p></e>
+        <e><p><l>in</l><r><s n="past"/><s n="p2"/><s n="pl"/></r></p></e>
+        <e><p><l>in</l><r><s n="past"/><s n="p3"/><s n="pl"/></r></p></e>
         <e><p><l>in</l><r><s n="inf"/></r></p></e>
         <e><p><l>î</l><r><s n="pp"/></r></p></e>
-        <e><p><l></l><r><s n="past"/></r></p><par n="k/e__vblex"/></e>
+<!--        <e><p><l></l><r><s n="past"/></r></p><par n="k/e__vblex"/></e>-->
 <!--    <e><p><l>iye</l><r><s n="perf"/></r></p></e>  CHECK LATER -->
         <e><p><l>ibû</l><r><s n="plu"/></r></p><par n="şo/__vblex"/></e>
         <e><p><l>ibim</l><r><s n="fpi"/><s n="p1"/><s n="sg"/></r></p></e>
@@ -1696,6 +1712,8 @@
     <!-- SECTION: Nouns -->
 
     <!-- New Feminines -->
+    <e lm="nufus"><i>nufus</i><par n="jin__n_f"/></e>
+    <e lm="mikafat"><i>mikafat</i><par n="jin__n_f"/></e>
     <e lm="tûl"><i>tûl</i><par n="jin__n_f"/></e>
     <e lm="banû"><i>ban</i><par n="ban/û__n_f"/></e>
     <e lm="pîrek"><i>pîrek</i><par n="jin__n_f"/></e>
@@ -15462,7 +15480,7 @@
     <e lm="îngilîzî"><p><l>îngilîzî</l><r>înglîzî</r></p><par n="nû__adj"/></e>
     <e lm="erebî"><i>ereb</i><par n="navend/î__adj"/></e>
     <e lm="taybet"><i>taybe</i><par n="pêwis/t__adj"/></e>
-    <e lm="dewlemend"><i>dewlemend</i><par n="germ__adj"/></e>
+    <e lm="dewlemend"><i>dewlemen</i><par n="dewlemen/d__adj"/></e>
     <e lm="reş"><i>reş</i><par n="germ__adj"/></e>
     <e lm="cuda"><i>cuda</i><par n="nû__adj"/></e>
     <e lm="perîşan"><i>perîşan</i><par n="germ__adj"/></e>
@@ -15743,6 +15761,14 @@
 
   </section>
   <section id="verbs" type="standard">
+        <!-- heşifandin; ; heşifand; heşifîn -->
+    <e lm="heşifandin"><p><l>heşifand</l><r>heşifandin</r></p><par n="kir/__vblex_tv"/></e>
+    <e lm="heşifandin"><p><l>diheşifîn</l><r>heşifandin</r></p><par n="dik/e__vblex_tv"/></e>
+    <e lm="heşifandin"><p><l>biheşifîn</l><r>heşifandin</r></p><par n="bik/e__vblex_tv"/></e>
+    <e lm="heşifandin"><p><l>neheşifand</l><r>heşifandin</r></p><par n="nekir/__vblex_tv"/></e>
+    <e lm="heşifandin"><p><l>naheşifîn</l><r>heşifandin</r></p><par n="nak/e__vblex_tv"/></e>
+    <e lm="heşifandin"><p><l>neheşifîn</l><r>heşifandin</r></p><par n="nek/e__vblex_tv"/></e>
+
         <!-- cîbicî kirin; ; cîbicî kir; cîbicî..k -->
     <e lm="cîbicî kirin" r="LR"><p><l>cîbicîkir</l><r>cîbicî<b/>kirin</r></p><par n="kir/__vblex_tv"/></e>
     <e lm="cîbicî kirin" r="LR"><p><l>cîbicîdik</l><r>cîbicî<b/>kirin</r></p><par n="dik/e__vblex_tv"/></e>
@@ -16477,7 +16503,7 @@
     <e lm="çûn"><p><l>diç</l><r>çûn</r></p><par n="diaxiv/e__vblex_iv"/></e>
     <e lm="çûn"><p><l>biç</l><r>çûn</r></p><par n="biaxiv/e__vblex_iv"/></e>
     <e lm="çûn"><p><l>her</l><r>çûn</r></p><par n="biaxiv/e__vblex_iv"/></e>
-    <e lm="çûn"><p><l>çû</l><r>çûn</r></p><par n="çû/n__vblex_iv"/></e>
+<!-- <e lm="çûn"><p><l>çû</l><r>çûn</r></p><par n="çû/n__vblex_iv"/></e>-->
     <e lm="çûn"><p><l>neçû</l><r>çûn</r></p><par n="neçû/n__vblex_iv"/></e>
     <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>
Index: incubator/apertium-kmr/apertium-kmr.kmr.rlx
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71827)
+++ incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71828)
@@ -9,7 +9,9 @@
 LIST Ant = ant;
 LIST Pron = prn ;
 LIST V = vaux vblex vbser vbcop vbhaver ;
+LIST Vaux = vaux ;
 LIST Adv = adv ;
+LIST Narr = narr ;
 LIST Num = num ;
 LIST Sent = sent ;
 LIST CC = cnjcoo ;
@@ -32,7 +34,7 @@
 LIST Obl = obl ;
 LIST Voc = voc ;
 LIST TV = tv ; 
-
+LIST NONTV = iv vbcop vaux vbhaver ;
 LIST Def = def ;
 LIST Ind = ind ;
 LIST Dem = dem ;
@@ -48,6 +50,7 @@
 LIST Prs = prs ; 
 LIST DÊ = "dê" ;
 LIST BI = "bi" ;
+LIST SELF = "xwe" ; 
 LIST SPEECH-VERB = "axaftin" ;
 LIST DO-VERB = "kirin";
 LIST BUY-VERB = "kirîn";
@@ -176,7 +179,7 @@
 
 SELECT N IF (0 Dema) (-1 Pr);
 
-SELECT Sg IF (0 N + Sg OR N + Pl) (1 TV + Past + Sg);
+SELECT Sg IF (0C N + Sg OR N + Pl) (1 TV + Past + Sg);
 
 SELECT Pl IF (0 N + Pl OR N + Pl) (1 TV + Past + Pl);
 
@@ -207,6 +210,8 @@
 
 SELECT Fut IF (0C V) (-1C* V + Fut);
 
+SELECT SELF + Pron IF (0C N OR SELF) (-1 Eza) (1* TV BARRIER NONTV);
+
 SECTION
 
 LIST @amod = @amod ;
@@ -227,7 +232,7 @@
 
 MAP @dobj TARGET NOMEN + Obl IF (NOT -1 Eza)(NOT -1* Pr BARRIER V) (NOT 1 Post) (1* TV BARRIER V);
 
-MAP @nmod:poss TARGET NOMEN + Obl IF (-1C Eza) ;
+MAP @nmod:poss TARGET Pron + Obl OR Pron + SELF OR NOMEN + Obl IF (-1C Eza) ;
 
 MAP @amod TARGET A IF (-1C Eza);
 
@@ -237,10 +242,14 @@
 
 SELECT V IF (0C V OR N) (-1 Adv);
 
+SELECT Cop IF (0C Cop OR Vaux) (NOT -1* PrfPrc); 
+
 SELECT Det IF (0 Adv OR Det) (1 N);
 
 SELECT CS IF (0 Gelo) (-1 BOS);
 
+SELECT NONTV IF (0C TV OR NONTV) (NOT 0 Past) (NOT 0 Narr) (NOT -1* Obl);
+
 SELECT V IF (0 Bû) ;
 
 SELECT CS IF (0 Ko) ;