Index: incubator/apertium-kmr/apertium-kmr.kmr.dix
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71958)
+++ incubator/apertium-kmr/apertium-kmr.kmr.dix	(revision 71959)
@@ -5003,7 +5003,7 @@
       <e lm="ayle"><i>ayl</i><par n="od/e__n"/></e>
       <e lm="aymarayî"><i>aymaray</i><par n="piran/î__n_f"/></e>
       <e lm="ayîndarî"><i>ayîndar</i><par n="piran/î__n_f"/></e>
-      <e lm="azadiye"><i>azadiy</i><par n="od/e__n"/></e>
+<!--  <e lm="azadiye"><i>azadiy</i><par n="od/e__n"/></e>-->
       <e lm="azadî"><i>azad</i><par n="piran/î__n_f"/></e>
       <e lm="azale"><i>azal</i><par n="od/e__n"/></e>
       <e lm="azamet"><i>azamet</i><par n="jin__n_f"/></e>
Index: incubator/apertium-kmr/apertium-kmr.kmr.rlx
===================================================================
--- incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71958)
+++ incubator/apertium-kmr/apertium-kmr.kmr.rlx	(revision 71959)
@@ -156,7 +156,7 @@
 
 SELECT Ref IF (0C N + Obl OR Ref) (-1 Eza);
 
-SELECT Eza IF (0 N + Voc OR N + Eza) (1 Obl OR Ref); 
+SELECT Eza IF (0C N + Voc OR N + Eza) (1 Obl OR Ref); 
 
 SELECT Post IF (0 RE) (-1 JÊ) ;
 
@@ -164,6 +164,12 @@
 
 SELECT Emph IF (0 Jî) (NOT 1 TV);
 
+REMOVE Emph IF (0 Emph OR Pr) (-1C Emph);
+
+SELECT JI IF (0 JI OR N) (1 Obl);
+
+SELECT Eza IF (0C Eza OR Voc) (-1 CC) (-2 N); 
+
 SELECT Pers IF (0 Pers OR Dem) ; 
 
 SELECT Neg IF ( 0 Neg OR Cop) (NOT 1 EOS) (NEGATE -1* V) (1* V) ;
@@ -172,6 +178,12 @@
 
 SELECT Post IF (0 De) (-1* Pr BARRIER WORD - NPNHA) ;
 
+SELECT Pr IF (1*C Post BARRIER WORD - NPNHA) ;
+
+SELECT Post IF (-1*C Pr BARRIER WORD - NPNHA) ;
+
+
+
 SELECT Pron IF (0 Pron OR Det) (1 Pr) ;
 
 REMOVE Dem IF (0 Prop) (NOT -1 Det) ;
@@ -199,7 +211,7 @@
 
 REMOVE Voc IF (0 Obl OR Voc) (-1 Eza);
 
-SELECT Eza IF (0 Eza OR Voc) (1 Obl);
+SELECT Eza IF (0C Eza OR Voc) (1 Obl);
 
 SELECT CS IF (0 CS OR Pron + Rel) (1* Prs);
 
@@ -239,6 +251,8 @@
 
 MAP @nmod:poss TARGET Pron + Obl OR Pron + SELF OR NOMEN + Obl IF (-1C Eza) ;
 
+MAP @nmod:poss TARGET NOMEN + Eza IF (-1C Eza);
+
 MAP @amod TARGET A IF (-1C Eza);
 
 MAP @nmod TARGET N IF (-1C Pr);