diff --git a/src/fst/morphology/affixes/pronouns.lexc b/src/fst/morphology/affixes/pronouns.lexc
index 20c101db..42ab273b 100644
--- a/src/fst/morphology/affixes/pronouns.lexc
+++ b/src/fst/morphology/affixes/pronouns.lexc
@@ -489,181 +489,93 @@ LEXICON PRON-INTERR_
 +Interr: # ; !!≈ * @CODE@
 
 LEXICON Interrogative !!= * @CODE@ is referred to from `pronouns.lexc`, hence assigns **+Pron** tag.
-mii+Pron+Interr:m	MK ; !!= * @CODE@ The Epsilon  inserted 2015-02-11
-ǩii+Pron+Interr:ǩ	MK ; !!= * @CODE@ The Epsilon  inserted 2015-02-11
-mii+Pron+Interr:mõõ	MK-long ;
-ǩii+Pron+Interr:ǩeä	MK-long ;
-mii+Pron+Interr:mõ	MK-short ;
-ǩii+Pron+Interr:ǩeä	MK-short ;
-mii+Pron+Interr:mââ	MK-low ;
-ǩii+Pron+Interr:ǩeä	MK-low ;
-mii+Pron+Interr+Sg+Loc:mâʹst	K ;
-mii+Pron+Interr+Sg+Acc:mâiʹd K ;
-mii+Pron+Interr+Sg+Acc+Err/Orth-no-q:mâid K ;
-ǩii+Pron+Interr+Sg+Loc:ǩeäʹst K ;
-
-kååʹtt+Pron+Interr+Sg+Nom:kååʹtt K ;
-kååʹtt+Pron+Interr+Sg+Acc:koon K ;
-kååʹtt+Pron+Interr+Sg+Gen:koon K ;
-kååʹtt+Pron+Interr+Sg+Acc+Use/NGminip+Use/NG:koonn K ;
-kååʹtt+Pron+Interr+Sg+Gen+Use/NGminip+Use/NG:koonn K ;
-kååʹtt+Pron+Interr+Sg+Ill:koozz K ;
-kååʹtt+Pron+Interr+Sg+Loc:koʹst K ;
-kååʹtt+Pron+Interr+Sg+Com:koin K ;
-kååʹtt+Pron+Interr+Sg+Com+Use/NGminip+Use/NG:kooin K ;
-kååʹtt+Pron+Interr+Sg+Abe:koontää K ;
-kååʹtt+Pron+Interr+Pl+Nom:kook K ;
-kååʹtt+Pron+Interr+Pl+Gen:kooi K ;
-kååʹtt+Pron+Interr+Pl+Gen:koi K ;
-kååʹtt+Pron+Interr+Pl+Acc:koid K ;
-kååʹtt+Pron+Interr+Pl+Ill:koid K ;
-kååʹtt+Pron+Interr+Pl+Loc:koin K ;
-kååʹtt+Pron+Interr+Pl+Loc+Use/NGminip+Use/NG:kooin K ;
-kååʹtt+Pron+Interr+Pl+Com+Use/NGminip+Use/NG:koivuiʹm K ;
-kååʹtt+Pron+Interr+Pl+Com:kooivuiʹm K ;
-kååʹtt+Pron+Interr+Pl+Abe:kooitää K ;
-kååʹtt+Pron+Interr+Sg+Prl:kooiǥ K ;
-kååʹtt+Pron+Interr+Ess:kååʹđen K ;
-kååʹtt+Pron+Interr+Par:kååʹđed K ;
-kååʹtt+Pron+Interr+Par+Use/NGminip+Use/NG:kååʹđ K ;
+mii+Pron+Interr:    PRON_MII ;
+ǩii+Pron+Interr:    PRON_KHII ;
+kååʹtt+Pron+Interr: PRON_KÅÅQTT ;
+
+LEXICON Relative
+mii+Pron+Rel:    PRON_MII ;
+ǩii+Pron+Rel:    PRON_KHII ;
+kååʹtt+Pron+Rel: PRON_KÅÅQTT ;
+
+LEXICON PRON_MII
+:m	    MK ;
+:mõõ	MK-long ;
+:mõ	    MK-short ;
+:mââ	MK-low-long ;
+:mâ 	M-low-short ;
+
+LEXICON PRON_KHII
+:ǩ	    MK ;
+:ǩeä	MK-long ;
+:ǩeä	MK-short ;
+:ǩeä	MK-low-long ;
+:ǩeä	K-low-short ;
+
+LEXICON PRON_KÅÅQTT
++Sg+Nom:kååʹtt K ;
++Sg+Acc:koon K ;
++Sg+Gen:koon K ;
++Sg+Acc+Use/NGminip+Use/NG:koonn K ;
++Sg+Gen+Use/NGminip+Use/NG:koonn K ;
++Sg+Ill:koozz K ;
++Sg+Loc:koʹst K ;
++Sg+Com:koin K ;
++Sg+Com+Use/NGminip+Use/NG:kooin K ;
++Sg+Abe:koontää K ;
++Pl+Nom:kook K ;
++Pl+Gen:kooi K ;
++Pl+Gen+Use/NGminip+Use/NG:koi K ;
++Pl+Acc:koid K ;
++Pl+Ill:koid K ;
++Pl+Loc:koin K ;
++Pl+Loc+Use/NGminip+Use/NG:kooin K ;
++Pl+Com+Use/NGminip+Use/NG:koivuiʹm K ;
++Pl+Com:kooivuiʹm K ;
++Pl+Abe:kooitää K ;
++Sg+Prl:kooiǥ K ;
++Ess:kååʹđen K ;
++Par:kååʹđed K ;
++Par+Use/NGminip+Use/NG:kååʹđ K ;
 
-LEXICON MK !!= * @CODE@
-+Sg+Nom:ii	K ;
-
-LEXICON MK-long !!= * @CODE@
-+Sg+Acc+Use/NGminip+Use/NG:n	K ;
-+Sg+Gen+Use/NGminip+Use/NG:n	K ;
-+Sg+Acc:nn	K ;
-+Sg+Gen:nn	K ;
-+Sg+Ill:zz	K ;
-+Pl+Nom:k	K ;
-
-LEXICON MK-short !!= * @CODE@
-+Sg+Com:in	K ;
-+Sg+Abe:ntää	K ;
-MK-PL-short ;
-
-LEXICON MK-PL-short !!= * @CODE@
-+Pl+Acc:iʹd	K ;
-+Pl+Ill:iʹd	K ;
-
-LEXICON MK-low !!= * @CODE@
-+Ess:ʹđen	K ;
-+Par:ʹđ	K ;
-+Par:ʹđed	K ;
-+Pl+Com:ivuiʹm	K ;
-+Pl+Abe:itää	K ;
-
-LEXICON INDEF-MK !!= * @CODE@
-+Sg+Nom:ii-ne	K ;
-
-LEXICON INDEF-MK-long !!= * @CODE@
-+Sg+Acc:n-ne	K ;
-+Sg+Gen:n-ne	K ;
-+Sg+Ill:zz-ne	K ;
-+Sg+Abe:nn-ne-tää	K ;
-+Pl+Nom:k-ne	K ;
-
-LEXICON INDEF-MK-low-short !!= * @CODE@
-+Sg+Loc:ʹstt-ne K ; 
-+Sg+Loc+Err/Orth-no-q:stt-ne K ; 
-+Pl+Acc:iʹd-ne	K ;
-+Pl+Acc+Err/Orth-no-q:id-ne	K ;
-+Pl+Ill:iʹd-ne	K ;
-+Pl+Ill+Err/Orth-no-q:id-ne	K ;
-
-LEXICON INDEF-MK-low !!= * @CODE@
-+Ess:ʹđen-ne	K ;
-+Par:ʹđ-ne	K ;
-+Par:ʹđed-ne	K ;
-+Pl+Com:i-ne-vuiʹm	K ;
-+Pl+Abe:i-ne-tää	K ;
-
-LEXICON DISTR-MK !!= * @CODE@
-+Sg+Nom:ii-a	K ;
-
-LEXICON DISTR-MK-long !!= * @CODE@
-+Sg+Acc:n-a	K ;
-+Sg+Gen:n-a	K ;
-+Sg+Ill:zz-a	K ;
-+Sg+Abe:nn-a-tää	K ;
-+Pl+Nom:k-a	K ;
-
-LEXICON DISTR-MK-low-short !!= * @CODE@
-+Sg+Loc:ʹstt-a K ; 
-+Pl+Acc:iʹd-a	K ;
-+Pl+Ill:iʹd-a	K ;
-
-LEXICON DISTR-MK-low !!= * @CODE@
-+Ess:ʹđen-a	K ;
-+Par:ʹđ-a	K ;
-+Par:ʹđed-a	K ;
-+Pl+Com:i-a-vuiʹm	K ;
-+Pl+Abe:i-a-tää	K ;
-
-LEXICON PRON-QNT_
-+Qnt: # ; ! THIS NEEDS FIXING.2018-01-10
-
-
-
-LEXICON Relative !!= * @CODE@
-mii+Pron+Rel:m       MK ;
-ǩii+Pron+Rel:ǩ       MK ;
-mii+Pron+Rel:mõõ     MK-long ;
-ǩii+Pron+Rel:ǩeä     MK-long ;
-mii+Pron+Rel:mõ      MK-short ;
-ǩii+Pron+Rel:ǩeä     MK-short ;
-mii+Pron+Rel:mââ     MK-low ;
-ǩii+Pron+Rel:ǩeä     MK-low ;
-mii+Pron+Rel+Sg+Loc:mâʹst	K ;
-kååʹtt+Pron+Rel+Sg+Nom:kååʹtt K ;
-kååʹtt+Pron+Rel+Sg+Acc+Use/NGminip+Use/NG:koon K ;
-kååʹtt+Pron+Rel+Sg+Gen+Use/NGminip+Use/NG:koon K ;
-kååʹtt+Pron+Rel+Sg+Acc:koonn K ;
-kååʹtt+Pron+Rel+Sg+Gen:koonn K ;
-kååʹtt+Pron+Rel+Sg+Ill:koozz K ;
-kååʹtt+Pron+Rel+Sg+Loc:koʹst K ;
-kååʹtt+Pron+Rel+Sg+Com:kooin K ;
-kååʹtt+Pron+Rel+Pl+Nom:kook K ;
-kååʹtt+Pron+Rel+Pl+Gen:kooi K ;
-kååʹtt+Pron+Rel+Pl+Gen:koi K ;
-kååʹtt+Pron+Rel+Pl+Acc:koid K ;
-kååʹtt+Pron+Rel+Pl+Ill:koid K ;
-kååʹtt+Pron+Rel+Pl+Loc:koin K ;
-kååʹtt+Pron+Rel+Pl+Loc:kooin K ;
-kååʹtt+Pron+Rel+Pl+Com:koivuiʹm K ;
-kååʹtt+Pron+Rel+Pl+Com:kooivuiʹm K ;
-kååʹtt+Pron+Rel+Sg+Prl:kooiǥ K ;
-!kååʹtt+Pron+Rel:koot K ; 
 
 LEXICON Indefinite !!= * @CODE@
 mii-ne+Pron+Indef:m       INDEF-MK ;
 ǩii-ne+Pron+Indef:ǩ       INDEF-MK ;
 mii-ne+Pron+Indef:mõõ     INDEF-MK-long ;
 ǩii-ne+Pron+Indef:ǩeä     INDEF-MK-long ;
-mii-ne+Pron+Indef:mâ      INDEF-MK-low-short ;
-ǩii-ne+Pron+Indef:ǩeä     INDEF-MK-low-short ;
-mii-ne+Pron+Indef:mââ     INDEF-MK-low ;
-ǩii-ne+Pron+Indef:ǩeä     INDEF-MK-low ;
+mii-ne+Pron+Indef:mõ      INDEF-MK-short ;
+ǩii-ne+Pron+Indef:ǩeä     INDEF-MK-short ;
+mii-ne+Pron+Indef:mââ     INDEF-MK-low-long ;
+ǩii-ne+Pron+Indef:ǩeä     INDEF-MK-low-long ;
+mii-ne+Pron+Indef:mâ      INDEF-M-low-short ;
+ǩii-ne+Pron+Indef:ǩeä     INDEF-K-low-short ;
 ǩii-ne+Pron+Indef+Sg+Com:ǩeäinn-ne K ;
 mii-ne+Pron+Indef+Sg+Com:mõiʹnn-ne K ;
 ǩii-ne+Pron+Indef+Pl+Loc:ǩeäinn-ne K ;
 mii-ne+Pron+Indef+Pl+Loc:mâiʹnn-ne K ;
 mii-ne+Use/NGminip+Use/NG+Pron+Indef+Sg+Loc:mâʹst-ne K ;
+
 kååʹtt-ne+Pron+Indef+Sg+Nom:kååʹtt-ne K ;
-kååʹtt-ne+Pron+Indef+Sg+Acc+Use/NGminip+Use/NG:koon-ne K ;
-kååʹtt-ne+Pron+Indef+Sg+Gen+Use/NGminip+Use/NG:koon-ne K ;
-kååʹtt-ne+Pron+Indef+Sg+Acc:koonn-ne K ;
-kååʹtt-ne+Pron+Indef+Sg+Gen:koonn-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Acc:koon-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Gen:koon-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Acc+Use/NGminip+Use/NG:koonn-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Gen+Use/NGminip+Use/NG:koonn-ne K ;
 kååʹtt-ne+Pron+Indef+Sg+Ill:koozz-ne K ;
 kååʹtt-ne+Pron+Indef+Sg+Loc:koʹst-ne K ;
-kååʹtt-ne+Pron+Indef+Sg+Com:kooin-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Com:koin-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Com+Use/NGminip+Use/NG:kooin-ne K ;
+kååʹtt-ne+Pron+Indef+Sg+Abe:koon-ne-tää K ;
 kååʹtt-ne+Pron+Indef+Pl+Nom:kook-ne K ;
 kååʹtt-ne+Pron+Indef+Pl+Gen:kooi-ne K ;
+kååʹtt-ne+Pron+Indef+Pl+Gen+Use/NGminip+Use/NG:koi-ne K ;
 kååʹtt-ne+Pron+Indef+Pl+Acc:koid-ne K ;
 kååʹtt-ne+Pron+Indef+Pl+Ill:koid-ne K ;
 kååʹtt-ne+Pron+Indef+Pl+Loc:koin-ne K ;
-kååʹtt-ne+Pron+Indef+Pl+Loc:kooin-ne K ;
+kååʹtt-ne+Pron+Indef+Pl+Loc+Use/NGminip+Use/NG:kooin-ne K ;
+kååʹtt-ne+Pron+Indef+Pl+Com+Use/NGminip+Use/NG:koi-ne-vuiʹm K ;
+kååʹtt-ne+Pron+Indef+Pl+Com:kooi-ne-vuiʹm K ;
+kååʹtt-ne+Pron+Indef+Pl+Abe:kooi-ne-tää K ;
 kååʹtt-ne+Pron+Indef+Sg+Prl:kooiǥ-ne K ;
 
 kuäbbaž-ne+Pron+Indef+Sg+Nom:kuäbbaž-ne K ;
@@ -689,29 +601,38 @@ mii-a+Pron+Distr:m       DISTR-MK ;
 ǩii-a+Pron+Distr:ǩ       DISTR-MK ;
 mii-a+Pron+Distr:mõõ     DISTR-MK-long ;
 ǩii-a+Pron+Distr:ǩeä     DISTR-MK-long ;
-mii-a+Pron+Distr:mâ      DISTR-MK-low-short ;
-ǩii-a+Pron+Distr:ǩeä     DISTR-MK-low-short ;
-mii-a+Pron+Distr:mââ     DISTR-MK-low ;
-ǩii-a+Pron+Distr:ǩeä     DISTR-MK-low ;
+mii-a+Pron+Distr:mõ      DISTR-MK-short ;
+ǩii-a+Pron+Distr:ǩeä     DISTR-MK-short ;
+mii-a+Pron+Distr:mââ     DISTR-MK-low-long ;
+ǩii-a+Pron+Distr:ǩeä     DISTR-MK-low-long ;
+mii-a+Pron+Distr:mâ      DISTR-M-low-short ;
+ǩii-a+Pron+Distr:ǩeä     DISTR-K-low-short ;
 ǩii-a+Pron+Distr+Sg+Com:ǩeäinn-a K ;
 mii-a+Pron+Distr+Sg+Com:mõiʹnn-a K ;
 ǩii-a+Pron+Distr+Pl+Loc:ǩeäinn-a K ;
 mii-a+Pron+Distr+Pl+Loc:mâiʹnn-a K ;
 mii-a+Use/NGminip+Use/NG+Pron+Distr+Sg+Loc:mâʹst-a K ;
+
 kååʹtt-a+Pron+Distr+Sg+Nom:kååʹtt-a K ;
-kååʹtt-a+Pron+Distr+Sg+Acc+Use/NGminip+Use/NG:koon-a K ;
-kååʹtt-a+Pron+Distr+Sg+Gen+Use/NGminip+Use/NG:koon-a K ;
-kååʹtt-a+Pron+Distr+Sg+Acc:koonn-a K ;
-kååʹtt-a+Pron+Distr+Sg+Gen:koonn-a K ;
+kååʹtt-a+Pron+Distr+Sg+Acc:koon-a K ;
+kååʹtt-a+Pron+Distr+Sg+Gen:koon-a K ;
+kååʹtt-a+Pron+Distr+Sg+Acc+Use/NGminip+Use/NG:koonn-a K ;
+kååʹtt-a+Pron+Distr+Sg+Gen+Use/NGminip+Use/NG:koonn-a K ;
 kååʹtt-a+Pron+Distr+Sg+Ill:koozz-a K ;
 kååʹtt-a+Pron+Distr+Sg+Loc:koʹst-a K ;
-kååʹtt-a+Pron+Distr+Sg+Com:kooin-a K ;
+kååʹtt-a+Pron+Distr+Sg+Com:koin-a K ;
+kååʹtt-a+Pron+Distr+Sg+Com+Use/NGminip+Use/NG:kooin-a K ;
+kååʹtt-a+Pron+Distr+Sg+Abe:koon-a-tää K ;
 kååʹtt-a+Pron+Distr+Pl+Nom:kook-a K ;
 kååʹtt-a+Pron+Distr+Pl+Gen:kooi-a K ;
+kååʹtt-a+Pron+Distr+Pl+Gen+Use/NGminip+Use/NG:koi-a K ;
 kååʹtt-a+Pron+Distr+Pl+Acc:koid-a K ;
 kååʹtt-a+Pron+Distr+Pl+Ill:koid-a K ;
 kååʹtt-a+Pron+Distr+Pl+Loc:koin-a K ;
-kååʹtt-a+Pron+Distr+Pl+Loc:kooin-a K ;
+kååʹtt-a+Pron+Distr+Pl+Loc+Use/NGminip+Use/NG:kooin-a K ;
+kååʹtt-a+Pron+Distr+Pl+Com+Use/NGminip+Use/NG:koi-a-vuiʹm K ;
+kååʹtt-a+Pron+Distr+Pl+Com:kooi-a-vuiʹm K ;
+kååʹtt-a+Pron+Distr+Pl+Abe:kooi-a-tää K ;
 kååʹtt-a+Pron+Distr+Sg+Prl:kooiǥ-a K ;
 
 kuäbbaž-a+Pron+Distr+Sg+Nom:kuäbbaž-a K ;
@@ -732,6 +653,180 @@ kuäbbaž-a+Pron+Distr+Pl+Loc:kuäbbain-a K ;
 kuäbbaž-a+Pron+Distr+Pl+Com:kuäbbai-a-vuiʹm K ;
 kuäbbaž-a+Pron+Distr+Pl+Abe:kuäbbai-a-tää K ;
 
+
+LEXICON MK !!= * @CODE@
++Sg+Nom:ii	K ;
+
+LEXICON MK-long !!= * @CODE@ :mõõ :ǩeä
++Sg+Acc:n	K ;
++Sg+Gen:n	K ;
++Sg+Acc+Use/NGminip+Use/NG:nn	K ;
++Sg+Gen+Use/NGminip+Use/NG:nn	K ;
++Sg+Ill:zz	K ;
++Sg+Abe:ntää K ;
++Pl+Nom:k	K ;
++Pl+Gen:i   K ;
+
+LEXICON MK-short !!= * @CODE@ :mõ :ǩeä
++Sg+Gen+Use/NGminip+Use/NG:i K ;
++Sg+Com+Use/NGminip+Use/NG:in	K ;
++Sg+Abe+Use/NGminip+Use/NG:ntää	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹd	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹd	K ;
++Pl+Loc+Use/NGminip+Use/NG:in	K ;
++Pl+Com:ivuiʹm	K ;
++Pl+Abe:itää	K ;
+
+LEXICON M-low-short !!= * @CODE@ :mâ
+MK-low-short ;
++Pl+Gen+Use/NGminip+Use/NG:i K ;
++Pl+Acc:iʹd	K ;
++Pl+Ill:iʹd	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹdd	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹdd	K ;
++Pl+Acc+Err/Orth-no-q:id K ;
++Pl+Ill+Err/Orth-no-q:id K ;
+
+LEXICON K-low-short !!= * @CODE@ :ǩeä
+MK-low-short ;
++Pl+Acc:id	K ;
++Pl+Ill:id	K ;
++Pl+Acc+Use/NGminip+Use/NG:idd	K ;
++Pl+Ill+Use/NGminip+Use/NG:idd	K ;
+
+LEXICON MK-low-short !!= * @CODE@ :mâ :ǩeä
++Sg+Loc:ʹst K ;
++Sg+Loc+Err/Orth-no-q:st K ;
++Sg+Com:in	K ;
++Pl+Loc:in	K ;
++Sg+Com+Use/NGminip+Use/NG:iʹnn	K ;
++Pl+Loc+Use/NGminip+Use/NG:iʹnn	K ;
+
+LEXICON MK-low-long !!= * @CODE@ :mââ :ǩeä
++Ess:ʹđen	K ;
++Par:ʹđ	K ;
++Par:ʹđed	K ;
++Pl+Com+Use/NGminip+Use/NG:ivuiʹm	K ;
++Pl+Abe+Use/NGminip+Use/NG:itää	K ;
+
+
+
+LEXICON INDEF-MK !!= * @CODE@
++Sg+Nom:ii-ne	K ;
+
+LEXICON INDEF-MK-long !!= * @CODE@
++Sg+Acc:n-ne	K ;
++Sg+Gen:n-ne	K ;
++Sg+Acc+Use/NGminip+Use/NG:nn-ne	K ;
++Sg+Gen+Use/NGminip+Use/NG:nn-ne	K ;
++Sg+Ill:zz-ne	K ;
++Sg+Abe:n-ne-tää	K ;
++Pl+Nom:k-ne	K ;
++Pl+Gen:i-ne   K ;
+
+LEXICON INDEF-MK-short !!= * @CODE@ :mõ :ǩeä
++Sg+Gen+Use/NGminip+Use/NG:i-ne K ;
++Sg+Com+Use/NGminip+Use/NG:in-ne	K ;
++Sg+Abe+Use/NGminip+Use/NG:n-ne-tää	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹd-ne	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹd-ne	K ;
++Pl+Loc+Use/NGminip+Use/NG:in-ne	K ;
++Pl+Com:i-ne-vuiʹm	K ;
++Pl+Abe:i-ne-tää	K ;
+
+
+LEXICON INDEF-M-low-short !!= * @CODE@ :mâ
+INDEF-MK-low-short ;
++Pl+Gen+Use/NGminip+Use/NG:i-ne K ;
++Pl+Acc:iʹd-ne	K ;
++Pl+Ill:iʹd-ne	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹdd-ne	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹdd-ne	K ;
++Pl+Acc+Err/Orth-no-q:id-ne K ;
++Pl+Ill+Err/Orth-no-q:id-ne K ;
+
+LEXICON INDEF-K-low-short !!= * @CODE@ :ǩeä
+INDEF-MK-low-short ;
++Pl+Acc:id-ne	K ;
++Pl+Ill:id-ne	K ;
++Pl+Acc+Use/NGminip+Use/NG:idd-ne	K ;
++Pl+Ill+Use/NGminip+Use/NG:idd-ne	K ;
+
+LEXICON INDEF-MK-low-short !!= * @CODE@
++Sg+Loc:ʹst-ne K ; 
++Sg+Loc+Err/Orth-no-q:st-ne K ;
++Sg+Com:in-ne	K ;
++Pl+Loc:in-ne	K ;
++Sg+Com+Use/NGminip+Use/NG:iʹnn-ne	K ;
++Pl+Loc+Use/NGminip+Use/NG:iʹnn-ne	K ;
+
+LEXICON INDEF-MK-low-long !!= * @CODE@
++Ess:ʹđen-ne	K ;
++Par:ʹđ-ne	K ;
++Par:ʹđed-ne	K ;
++Pl+Com+Use/NGminip+Use/NG:i-ne-vuiʹm	K ;
++Pl+Abe+Use/NGminip+Use/NG:i-ne-tää	K ;
+
+
+
+LEXICON DISTR-MK !!= * @CODE@
++Sg+Nom:ii-a	K ;
+
+LEXICON DISTR-MK-long !!= * @CODE@
++Sg+Acc:n-a	K ;
++Sg+Gen:n-a	K ;
++Sg+Acc+Use/NGminip+Use/NG:nn-a	K ;
++Sg+Gen+Use/NGminip+Use/NG:nn-a	K ;
++Sg+Ill:zz-a	K ;
++Sg+Abe:n-a-tää	K ;
++Pl+Nom:k-a	K ;
++Pl+Gen:i-a   K ;
+
+LEXICON DISTR-MK-short !!= * @CODE@ :mõ :ǩeä
++Sg+Gen+Use/NGminip+Use/NG:i-a K ;
++Sg+Com+Use/NGminip+Use/NG:in-a	K ;
++Sg+Abe+Use/NGminip+Use/NG:n-a-tää	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹd-a	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹd-a	K ;
++Pl+Loc+Use/NGminip+Use/NG:in-a	K ;
++Pl+Com:i-a-vuiʹm	K ;
++Pl+Abe:i-a-tää	K ;
+
+LEXICON DISTR-M-low-short !!= * @CODE@ :mâ
+DISTR-MK-low-short ;
++Pl+Gen+Use/NGminip+Use/NG:i-a K ;
++Pl+Acc:iʹd-a	K ;
++Pl+Ill:iʹd-a	K ;
++Pl+Acc+Use/NGminip+Use/NG:iʹdd-a	K ;
++Pl+Ill+Use/NGminip+Use/NG:iʹdd-a	K ;
++Pl+Acc+Err/Orth-no-q:id-a K ;
++Pl+Ill+Err/Orth-no-q:id-a K ;
+
+LEXICON DISTR-K-low-short !!= * @CODE@ :ǩeä
+DISTR-MK-low-short ;
++Pl+Acc:id-a	K ;
++Pl+Ill:id-a	K ;
++Pl+Acc+Use/NGminip+Use/NG:idd-a	K ;
++Pl+Ill+Use/NGminip+Use/NG:idd-a	K ;
+
+LEXICON DISTR-MK-low-short !!= * @CODE@
++Sg+Loc:ʹst-a K ; 
++Sg+Loc+Err/Orth-no-q:st-a K ;
++Sg+Com:in-a	K ;
++Pl+Loc:in-a	K ;
++Sg+Com+Use/NGminip+Use/NG:iʹnn-a	K ;
++Pl+Loc+Use/NGminip+Use/NG:iʹnn-a	K ;
+
+LEXICON DISTR-MK-low-long !!= * @CODE@
++Ess:ʹđen-a	K ;
++Par:ʹđ-a	K ;
++Par:ʹđed-a	K ;
++Pl+Com+Use/NGminip+Use/NG:i-a-vuiʹm	K ;
++Pl+Abe+Use/NGminip+Use/NG:i-a-tää	K ;
+
+LEXICON PRON-QNT_
++Qnt: # ; ! THIS NEEDS FIXING.2018-01-10
+
 !! ### SPATIAL PRONOUNS
 LEXICON PRON-SPAT-SG1_
 +Sem/Plc+Sg1: K ;