From 1629b7aafa49f545c3274b61d34baf2ff70b874c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Judithe=20Denb=C3=A6k?= <judithe@oqaasileriffik.gl>
Date: Fri, 15 Nov 2024 22:21:16 +0000
Subject: [PATCH] spell

---
 devtools/speller_result_typos.to.kl.html      | 90 +++++++++----------
 .../affixes/derivations-inflections.lexc      | 35 +++++---
 src/fst/morphology/root.lexc                  | 27 +++++-
 src/fst/morphology/stems/nouns.lexc           | 18 ++--
 src/fst/morphology/stems/verbs.lexc           | 34 +++++--
 test/data/typos.txt                           |  2 +-
 6 files changed, 138 insertions(+), 68 deletions(-)

diff --git a/devtools/speller_result_typos.to.kl.html b/devtools/speller_result_typos.to.kl.html
index 4d4d25489..6d5356767 100644
--- a/devtools/speller_result_typos.to.kl.html
+++ b/devtools/speller_result_typos.to.kl.html
@@ -13,11 +13,11 @@
     <div id="header">
       <div id="engine" abbreviation="to">
         <div id="toolversion">n/a</div>
-        <div id="processing" memoryusage="n/a" usertime="21.613" realtime="21.703" systime="0.086" words_per_sec="22.58"> </div>
+        <div id="processing" memoryusage="n/a" usertime="18.746" systime="0.088" realtime="18.845" words_per_sec="26.00"> </div>
       </div>
       <div id="lexicon" version="Built using HFST 3.16.0"> </div>
       <div id="document">typos.txt</div>
-      <div id="timestamp">20241115-0022</div>
+      <div id="timestamp">20241115-2214</div>
       <div id="truefalsesummary" wordcount="490">
         <div id="originals" correct="0" error="490"> </div>
         <div id="spellers" correct="0" error="490"> </div>
@@ -28,8 +28,8 @@
         <div id="accuracy">1.00</div>
       </div>
       <div id="suggestionsummary">
-        <div id="sugg1" editdist1="414" editdist2="64" editdist3plus="10"> </div>
-        <div id="sugg2" editdist1="1" editdist2="1" editdist3plus="0"> </div>
+        <div id="sugg1" editdist1="416" editdist2="64" editdist3plus="10"> </div>
+        <div id="sugg2" editdist1="0" editdist2="0" editdist3plus="0"> </div>
         <div id="sugg3" editdist1="0" editdist2="0" editdist3plus="0"> </div>
         <div id="sugg4" editdist1="0" editdist2="0" editdist3plus="0"> </div>
         <div id="sugg5" editdist1="0" editdist2="0" editdist3plus="0"> </div>
@@ -38,7 +38,7 @@
         <div id="badsuggs" editdist1="0" editdist2="0" editdist3plus="0"> </div>
         <div id="averageposition">1.00</div>
         <div id="averagesuggs_with_correct">9.58</div>
-        <div id="top1pos_percent">99.59</div>
+        <div id="top1pos_percent">100.00</div>
         <div id="top5pos_percent">100.00</div>
         <div id="allpos_percent">100.00</div>
         <div id="nosugg_percent">0.00</div>
@@ -291,14 +291,10 @@
         <td class="expected">Afrikap</td>
         <td class="edit_dist">2</td>
         <td class="position">1</td>
-        <td class="suggestions" count="6">
+        <td class="suggestions" count="2">
           <ul>
             <li class="suggestion" expected="yes">Afrikap</li>
             <li class="suggestion">Afrika</li>
-            <li class="suggestion">Iffikkap</li>
-            <li class="suggestion">Affalikkap</li>
-            <li class="suggestion">Qaffikkap</li>
-            <li class="suggestion">Saffikkap</li>
           </ul>
         </td>
         <td/>
@@ -312,10 +308,9 @@
         <td class="expected">Afghanistanimi</td>
         <td class="edit_dist">1</td>
         <td class="position">1</td>
-        <td class="suggestions" count="2">
+        <td class="suggestions" count="1">
           <ul>
             <li class="suggestion" expected="yes">Afghanistanimi</li>
-            <li class="suggestion">Agianissanimi</li>
           </ul>
         </td>
         <td/>
@@ -334,13 +329,13 @@
             <li class="suggestion" expected="yes">Amerikallu</li>
             <li class="suggestion">Amerikalli</li>
             <li class="suggestion">Amerikalu</li>
-            <li class="suggestion">Ameerakkallu</li>
             <li class="suggestion">Ameeriakkallu</li>
             <li class="suggestion">Ameeriikkallu</li>
             <li class="suggestion">Ameerikkalu</li>
-            <li class="suggestion">Ameerikkillu</li>
-            <li class="suggestion">Ameertikkallu</li>
             <li class="suggestion">Meersikkallu</li>
+            <li class="suggestion">Umeersikkallu</li>
+            <li class="suggestion">Ameeriakkalli</li>
+            <li class="suggestion">Ameeriikkalli</li>
           </ul>
         </td>
         <td/>
@@ -360,12 +355,12 @@
             <li class="suggestion">Amerikamit</li>
             <li class="suggestion">Amerikamiut</li>
             <li class="suggestion">Amerikatut</li>
-            <li class="suggestion">Ameerakkamut</li>
             <li class="suggestion">Ameeriakkamut</li>
             <li class="suggestion">Ameeriikkamut</li>
-            <li class="suggestion">Ameertikkamut</li>
             <li class="suggestion">Meersikkamut</li>
             <li class="suggestion">Umeersikkamut</li>
+            <li class="suggestion">Ameeriakkamit</li>
+            <li class="suggestion">Ameeriikkamit</li>
           </ul>
         </td>
         <td/>
@@ -383,14 +378,14 @@
           <ul>
             <li class="suggestion" expected="yes">Amerikap</li>
             <li class="suggestion">Umerukkap</li>
-            <li class="suggestion">Amerakkap</li>
             <li class="suggestion">Ameriakkap</li>
             <li class="suggestion">Ameriikkap</li>
             <li class="suggestion">Amerikka</li>
             <li class="suggestion">Amersikkap</li>
-            <li class="suggestion">Amertikkap</li>
-            <li class="suggestion">Imerakkap</li>
-            <li class="suggestion">Imeriakkap</li>
+            <li class="suggestion">Imeriikkap</li>
+            <li class="suggestion">Imerikka</li>
+            <li class="suggestion">Imersikkap</li>
+            <li class="suggestion">Imertikkap</li>
           </ul>
         </td>
         <td/>
@@ -903,12 +898,12 @@
             <li class="suggestion" expected="yes">Naalakkersuisut</li>
             <li class="suggestion">Naalakkersisut</li>
             <li class="suggestion">Naalakkersusit</li>
+            <li class="suggestion">Naalakkersutut</li>
             <li class="suggestion">Naalakkersugut</li>
             <li class="suggestion">Naalakkersukut</li>
             <li class="suggestion">Naalakkersumut</li>
             <li class="suggestion">Naalakkersunut</li>
             <li class="suggestion">Naalakkersusiut</li>
-            <li class="suggestion">Naalakkersutut</li>
             <li class="suggestion">Naalakkersuusut</li>
           </ul>
         </td>
@@ -1110,14 +1105,14 @@
           <ul>
             <li class="suggestion" expected="yes">Sulisitsisut</li>
             <li class="suggestion">Qulisitsisut</li>
+            <li class="suggestion">Qulisittut</li>
+            <li class="suggestion">Sulisittut</li>
             <li class="suggestion">Julikitsut</li>
             <li class="suggestion">Julisiasut</li>
             <li class="suggestion">Julisissut</li>
             <li class="suggestion">Julisisut</li>
             <li class="suggestion">Julisituut</li>
             <li class="suggestion">Juliuitsut</li>
-            <li class="suggestion">Mulikitsut</li>
-            <li class="suggestion">Muliuitsut</li>
           </ul>
         </td>
         <td/>
@@ -4636,11 +4631,11 @@
             <li class="suggestion">innuttaassut</li>
             <li class="suggestion">inuttaasut</li>
             <li class="suggestion">inguttagaasut</li>
+            <li class="suggestion">innuttaartut</li>
+            <li class="suggestion">innuttaasatut</li>
             <li class="suggestion">innuttaasit</li>
             <li class="suggestion">innuttaatsit</li>
-            <li class="suggestion">innuttamaasit</li>
-            <li class="suggestion">innuttanaasit</li>
-            <li class="suggestion">innuttaqaasit</li>
+            <li class="suggestion">innuttaattut</li>
           </ul>
         </td>
         <td/>
@@ -4657,13 +4652,13 @@
         <td class="suggestions" count="10">
           <ul>
             <li class="suggestion" expected="yes">innuttaasut</li>
+            <li class="suggestion">innuttatut</li>
             <li class="suggestion">innutaasut</li>
             <li class="suggestion">innuttavut</li>
             <li class="suggestion">innuttagut</li>
             <li class="suggestion">innuttakut</li>
             <li class="suggestion">innuttamut</li>
             <li class="suggestion">innuttanut</li>
-            <li class="suggestion">innuttatut</li>
             <li class="suggestion">innuttarsiut</li>
             <li class="suggestion">innuttarsua</li>
           </ul>
@@ -5558,16 +5553,16 @@
         <td/>
         <td/>
       </tr>
-      <tr class="word" corrsugg="2">
+      <tr class="word" corrsugg="1">
         <td class="original" status="error" speller="error">kunngikkormiusut</td>
         <td>TP</td>
         <td class="expected">kunngikkormiutut</td>
         <td class="edit_dist">1</td>
-        <td class="position">2</td>
+        <td class="position">1</td>
         <td class="suggestions" count="10">
           <ul>
-            <li class="suggestion">kunngikkormiuusut</li>
             <li class="suggestion" expected="yes">kunngikkormiutut</li>
+            <li class="suggestion">kunngikkormiuusut</li>
             <li class="suggestion">kunngikkormiugut</li>
             <li class="suggestion">kunngikkormiuisut</li>
             <li class="suggestion">kunngikkormiukut</li>
@@ -7621,11 +7616,11 @@
             <li class="suggestion">qimutauitsut</li>
             <li class="suggestion">qimutsiuitsut</li>
             <li class="suggestion">qimitsiitsut</li>
+            <li class="suggestion">qimutsiittut</li>
             <li class="suggestion">qilutsiitsut</li>
             <li class="suggestion">qimatsiitsut</li>
             <li class="suggestion">qimitauitsut</li>
             <li class="suggestion">qimitsiuitsut</li>
-            <li class="suggestion">qimittuitsut</li>
           </ul>
         </td>
         <td/>
@@ -8124,8 +8119,8 @@
             <li class="suggestion">siullersissut</li>
             <li class="suggestion">siullertissut</li>
             <li class="suggestion">siulleruissut</li>
+            <li class="suggestion">siullermitut</li>
             <li class="suggestion">siillersissut</li>
-            <li class="suggestion">siillertissut</li>
           </ul>
         </td>
         <td/>
@@ -8200,7 +8195,7 @@
             <li class="suggestion">sinnersummi</li>
             <li class="suggestion">siuneersummi</li>
             <li class="suggestion">siunneersummi</li>
-            <li class="suggestion">siunneriummi</li>
+            <li class="suggestion">siunnerpummi</li>
           </ul>
         </td>
         <td/>
@@ -8218,6 +8213,7 @@
           <ul>
             <li class="suggestion" expected="yes">siunnersuut</li>
             <li class="suggestion">siinnersut</li>
+            <li class="suggestion">siunnertut</li>
             <li class="suggestion">isiunnersut</li>
             <li class="suggestion">uiunnersut</li>
             <li class="suggestion">siannersut</li>
@@ -8225,7 +8221,6 @@
             <li class="suggestion">sinnersut</li>
             <li class="suggestion">siuneersut</li>
             <li class="suggestion">siunneersut</li>
-            <li class="suggestion">siunnerput</li>
           </ul>
         </td>
         <td/>
@@ -11189,11 +11184,11 @@
             <li class="suggestion">taaguuserniarneqarsinaalersut</li>
             <li class="suggestion">taaguuserniarneqarsinaarnersut</li>
             <li class="suggestion">taaguuserniarneqarsiniaanersut</li>
+            <li class="suggestion">taaguuserniarneqarsinnaanertut</li>
             <li class="suggestion">kaaguuserniarneqarsinnaanersut</li>
             <li class="suggestion">paaguuserniarneqarsinnaanersut</li>
             <li class="suggestion">saaguuserniarneqarsinnaanersut</li>
             <li class="suggestion">taaguuseriarneqarsinnaanersut</li>
-            <li class="suggestion">taaguuseriniarneqarsinnaanersut</li>
           </ul>
         </td>
         <td/>
@@ -11626,19 +11621,24 @@
         <td/>
         <td/>
       </tr>
-      <tr class="word" corrsugg="2">
+      <tr class="word" corrsugg="1">
         <td class="original" status="error" speller="error">sammiumaassangaat</td>
         <td>TP</td>
-        <td class="expected">sammiumassagaat</td>
-        <td class="edit_dist">2</td>
-        <td class="position">2</td>
-        <td class="suggestions" count="5">
+        <td class="expected">sammiumaassagaat</td>
+        <td class="edit_dist">1</td>
+        <td class="position">1</td>
+        <td class="suggestions" count="10">
           <ul>
+            <li class="suggestion" expected="yes">sammiumaassagaat</li>
+            <li class="suggestion">sammiumaassaqaat</li>
+            <li class="suggestion">kammiumaassagaat</li>
+            <li class="suggestion">sammiumaassagaa</li>
             <li class="suggestion">sammiumasassagaat</li>
-            <li class="suggestion" expected="yes">sammiumassagaat</li>
-            <li class="suggestion">sammiumasassanganat</li>
-            <li class="suggestion">sammiumasassangaqat</li>
-            <li class="suggestion">sammiumasassaniaat</li>
+            <li class="suggestion">sammiumassagaat</li>
+            <li class="suggestion">sammiumaassaasaat</li>
+            <li class="suggestion">sammiumaassaneqat</li>
+            <li class="suggestion">sammiumaassaneraat</li>
+            <li class="suggestion">sammiumaassanerat</li>
           </ul>
         </td>
         <td/>
diff --git a/src/fst/morphology/affixes/derivations-inflections.lexc b/src/fst/morphology/affixes/derivations-inflections.lexc
index 9d6e6a15f..c54629abc 100644
--- a/src/fst/morphology/affixes/derivations-inflections.lexc
+++ b/src/fst/morphology/affixes/derivations-inflections.lexc
@@ -61332,7 +61332,7 @@ LEXICON TV !!= * @CODE@ Forudsættes tagget via HTR
 +GASUAR+Der/vv+INNAR+Der/vv+SIMA+Der/vv:%>gasuaannarsima Saq ;
 +GASUAR+Der/vv+QQU+Der/vv:%>gasuaqqu HTR_V_SAQ_si ;
 +GASUAR+Der/vv+RIAR+Der/vv:%>gasuariar Gaq ;
-+GI+Der/vv:%>gi XTgujaaX ;
+@U.imp.OFF@+GI+Der/vv:@U.imp.OFF@%>gi XTgujaaX ; !ameerikkillu
 +GIAQAR+Der/vv+Orth/Arch:%>g3iaqar Gaq ;
 !+GIARTUAAR+Der/vv:%>g3iartuaar post_Gaq ;
 +GIARTUAAR+Der/vv:%>g3iartuaar TV-mod_r ; !PL202409 forsøg på at tillade passive nominer uden at skabe rekursivitet
@@ -63153,7 +63153,7 @@ LEXICON TV !!= * @CODE@ Forudsættes tagget via HTR
 +QQUSAAR+Der/vv+SURE+Der/vv:%>%TRUNCqqusaarsor flex-iv_schwa ;
 +QQUSAAR+Der/vv+SURE+Der/vv+QINA+Der/vv:%>%TRUNCqqusaarsoreqina flex-tv_vaa ;
 +QQUSAAR+Der/vv+SURE+Der/vv+QINA+Der/vv:%>%TRUNCqqusaarsoreqina flex-iv_qina ;
-+RAR+Der/vv:%>%TRUNCrar Gaq ;
++RAR+Der/vv:%>%TRUNCrar tv_rar ; !Gaq
 +RAR@U.Num.Pl@+Der/vv+GALUAR+Der/vv:%>%TRUNCraraluar@U.Num.Pl@ post_Gaq ;
 +RAR+Der/vv+GUNNAIR+Der/vv:%>%TRUNCrarunnaar post_Gaq ;
 +RAR+Der/vv+LIR+Der/vv+TUR+Der/vv:%>%TRUNCralertor post_Gaq ;
@@ -63170,7 +63170,7 @@ LEXICON TV !!= * @CODE@ Forudsættes tagget via HTR
 +RIAANNAA+Der/vv:%>%TRUNCriaannaa TV-mod_V ; !PL20220105 ad hoc ved transitiver for +RIAQ+Der/vn+INNAQ+Der/nn+U+Der/nv jf. TUU+Der/vv og TUSSAA+Der/vv
 +RIAANNAA+Der/vv+NNGUATSIAR+Der/vv:%>%TRUNCriaannaannguatsiar post_Gaq ;
 +RIAANNAA+Der/vv+SSA+Der/vv:%>%TRUNCriaannaassa TV-mod_ssa ;
-+RIAR+Der/vv:%>%TRUNCriar Gaq ;
++RIAR+Der/vv:%>%TRUNCriar tv_riar ; !Gaq
 +RIAR+Der/vv+ALLAP+Der/vv:%>%TRUNCriaallap Taq ;
 +RIAR+Der/vv+ALLAP+Der/vv+TIP+Der/vv:%>%TRUNCriaallatsip DOTR_C ;
 +RIAR+Der/vv+GALUAR+Der/vv:%>%TRUNCriaraluar post_Gaq ;
@@ -63985,7 +63985,7 @@ LEXICON TV !!= * @CODE@ Forudsættes tagget via HTR
 +TIGE+Der/vv+SSA+Der/vv+GALUAR+Der/vv:%>tigissagaluar post_Gaq ;
 +TIGE+Der/vv+SSA+Der/vv+NIR+Der/vv:%>tigissaner flex-tv_fleksiver ;
 +TIP+Der/vv:%>tip Db_TIP_gennemgang ;
-+TIR+Der/vv:%>ter post_Gaq_addi ; !NB kan både blive HTR og tage TAQ
++TIR+Der/vv:%>ter tv_tir ; !post_Gaq_addi !NB kan både blive HTR og tage TAQ
 +TIR+Der/vv+RUSAAR+Der/vv+INNAR+Der/vv+SSA+Der/vv:%>terusaaginnassa TV-mod_ssa ;
 +TIR+Der/vv+SIMA+Der/vv:%>tersima Saq ; !aserortersimallugit piss. 20240919 OD
 +TIR+Der/vv+SINNAA+Der/vv:%>tersinnaa Saq ; !aserortersinnaallugit piss. 20241001 OD
@@ -79700,7 +79700,7 @@ LEXICON XTirXmorf !!= * @CODE@  til stammer med ir
 +QQUSAAR+Der/vv+SURE+Der/vv:%>%TRUNCqqusaarsor flex-iv_schwa ;
 +QQUSAAR+Der/vv+SURE+Der/vv+QINA+Der/vv:%>%TRUNCqqusaarsoreqina flex-tv_vaa ;
 +QQUSAAR+Der/vv+SURE+Der/vv+QINA+Der/vv:%>%TRUNCqqusaarsoreqina flex-iv_qina ;
-+RAR+Der/vv:%>%TRUNCrar Gaq ;
++RAR+Der/vv:%>%TRUNCrar tv_rar ; !Gaq
 +RAR@U.Num.Pl@+Der/vv+GALUAR+Der/vv:%>%TRUNCraraluar@U.Num.Pl@ post_Gaq ;
 +RAR+Der/vv+GUNNAIR+Der/vv:%>%TRUNCrarunnaar post_Gaq ;
 +RAR+Der/vv+PALLAP+Der/vv:%>%TRUNCrapallap Taq ;
@@ -79718,7 +79718,7 @@ LEXICON XTirXmorf !!= * @CODE@  til stammer med ir
 +RATAR+Der/vv+SINNAA+Der/vv:%>%TRUNCratarsinnaa Saq ;
 +RIAANNAA+Der/vv:%>%TRUNCriaannaa TV-mod_V ; !PL20220105 ad hoc ved transitiver for +RIAQ+Der/vn+INNAQ+Der/nn+U+Der/nv jf. TUU+Der/vv og TUSSAA+Der/vv
 +RIAANNAA+Der/vv+NNGUATSIAR+Der/vv:%>%TRUNCriaannaannguatsiar post_Gaq ;
-+RIAR+Der/vv:%>%TRUNCriar Gaq ;
++RIAR+Der/vv:%>%TRUNCriar tv_riar ; !Gaq
 !+RIAR+Sem/Time:%>%TRUNCriutaa part ; !PL 20180223 udkommenteret. Forekommer næppe uden foranstående NIAR og altså dækket af NIARIUTAA
 +RIAR+Der/vv+ALLAP+Der/vv:%>%TRUNCriaallap Taq ;
 +RIAR+Der/vv+ALLAP+Der/vv+TIP+Der/vv:%>%TRUNCriaallatsip DOTR_C ;
@@ -81025,7 +81025,7 @@ LEXICON XTirXmorf !!= * @CODE@  til stammer med ir
 +TIP+Der/vv+Gram/Db+VIP+Der/vv+SINNAA+Der/vv:%>tivissinnaa Saq ;
 +TIP+Der/vv+Gram/Db+VIP+Der/vv+TIP+Der/vv:%>sivitsip DOTR_C ;
 +TIP+Der/vv+Gram/Db+VIP+Der/vv+TIP+Der/vv:%>tivitsip DOTR_C ;
-+TIR+Der/vv:%>ter HTR_longV_GAQ_addi ;
++TIR+Der/vv:%>ter tv_tir ; !HTR_longV_GAQ_addi
 !+TIR+Der/vv+HTR+Der/vv:%>teri IV_voq ;
 +TIR+Der/vv+SIMA+Der/vv:%>tersima Saq ;
 +TIR+Der/vv+SINNAA+Der/vv:%>tersinnaa Saq ;
@@ -81486,6 +81486,7 @@ LEXICON TVi_vaa !!= * @CODE@ tuni forudsættes Gram-tagget via HTR
 +GUMA+Der/vv+VALLAAR+Der/vv+GALUAR+Der/vv:%>g3umavallaaraluar post_Gaq ;
 +GUMA+Der/vv+VALLAAR+Der/vv+GALUAR+Der/vv+QE+Der/vv:%>g3umavallaaralua%TRUNCq Saq_schwa ;
 +GUMAAR+Der/vv:%>g3umaar post_Gaq ;
++GUMAAR+Der/vv+SSA+Der/vv:%>g3umaassa tv_ssa ; !TV-mod_ssa
 +GUMAAR+Der/vv+SURE+Der/vv+Gram/Db:%>g3umaarsor TV-mod_schwa ;
 +GUMAAR+Der/vv+TAAR+Der/vv:%>g3umaataar post_Gaq ; !tikisikkumaataarnermit piss. Ondi 20240718
 +GUMALLIR+Der/vv:%>g3umaller TV-mod_ir ; !liv 170131
@@ -93903,7 +93904,7 @@ LEXICON flex-tv2 !!= * @CODE@
 +V+Par+3Sg+1SgO:%>gaanga K ; !flex-tv
 +V+Par+2Pl+1SgO:%>gissinga K ; !flex-tv
 +V+Par+3Pl+1SgO:%>gaannga K ; !flex-tv
-+V+Par+1Sg+2SgO:%>gikkit K ; !flex-tv
+@U.2pO.ON@+V+Par+1Sg+2SgO:@U.2pO.ON@%>gikkit K ; !flex-tv
 +V+Par+3Sg+2SgO:%>gaatit K ; !flex-tv
 +V+Par+1Pl+2SgO:%>gitsigit K ; !flex-tv
 +V+Par+3Pl+2SgO:%>gaatsit K ; !flex-tv
@@ -100132,6 +100133,8 @@ LEXICON XTgujaaX2 !!= * @CODE@
 +V+Ind+1Pl+3PlO:%>%VTRUNCujavut K ;
 +V+Ind+3Pl+3SgO:%>%VTRUNCujaat K ; 
 +V+Ind+3Pl+3PlO:%>%VTRUNCujaat K_plur ;
+ XTgujaaX2_imp_flag ; LEXICON XTgujaaX2_imp_flag @U.imp.ON@ XTgujaaX2_imp ;
+LEXICON XTgujaaX2_imp
 +V+Imp+2Sg+1SgO:%>nga K_TUQ ;
 +V+Imp+2Sg+3SgO:%>uk K_TUQ ;
 +V+Imp+2Sg+1PlO:%>sigut K_TUQ ;
@@ -106462,7 +106465,7 @@ LEXICON tup- !!= * @CODE@
 +KKUUTAAR+Der/nv:%>%TRUNCkkuutaar flex-tv ; !liv 170403 til ord som 'niuertoqarfikkuutaarlugit'
 +LIAR+Der/nv:%>%TRUNCliar IV_r_UTE_gennemgang ;
 !+LIR+Der/nv+Orth/Alt:%>%TRUNCler IV_r_stem ; !''kakkilertarnerinik'' hos Moses !PL20240531 bør kun danne Gram/Refl, ikke IV
-+LIR+Der/nv:%>%TRUNCler HTR_ir_GAQ_i ;
++LIR+Der/nv:%>%TRUNCler lir_tv ; !HTR_ir_GAQ_i
 +LIRNGUSAATE@U.Num.Pl@+Der/nv+Gram/Reci:%>%TRUNClerngusaap@U.Num.Pl@ XIuteXmorf ;
 +LIRI+Der/nv:%>%TRUNCleri XIi_voqXmorf ;
 +LIRSUR+Der/nv:%>%TRUNClersor TV_UTE_gennemgang ;
@@ -119007,7 +119010,7 @@ LEXICON Z1+ssZ !!= * @CODE@
 +LIUTE+Der/nv:%>%TRUNCliup HTR_UTE_SSAQ_ssi ;
 +LUP@C.Num@+Der/nv:%>lup@C.Num@ IV_k_stem ;
 !+MAAR+Der/nv:%>%TRUNCmaar IV_r_stem ;
-+NIP+Der/nv:%>%TRUNCnip IV_k ;
++NIP+Der/nv:%>%TRUNCnip nip_iv  ; !IV_k
 +NNGUR+Der/nv+Gram/IV:%>%TRUNCnngor IV_r_UTE_gennemgang ; !PL 20180201 Nyt gennemgangskatalog
 +NNGUR+Der/nv:%>%TRUNCnngor HTR_r_GAQ_i ;
 +NNGUR+Der/nv+SAR+Der/vv:%>%TRUNCnngorsar DOTR_IV_r ;
@@ -120192,6 +120195,12 @@ LEXICON iv_qe !+QE+Der/vv
 LEXICON tv_qe !+QE+Der/vv
 @U.niq.OFF@@U.qe.ON@ TV-mod_qe ;
 
+LEXICON tv_rar
+@U.rar.ON@ Gaq ;
+
+LEXICON tv_riar
+@U.riar.ON@ Gaq ;
+
 LEXICON iv_ssa
 @U.niaq.OFF@ IV-mod_ssa ;
 
@@ -120199,6 +120208,9 @@ LEXICON tv_ssa
 @U.niaq.OFF@ TV-mod_ssa ;
 !sammiumassaniaat
 
+LEXICON tv_tir
+@U.tirtv.ON@ post_Gaq_addi ;
+
 LEXICON iv_vip
 @U.vip.ON@ IV-mod_iC ;
 !punngavilersuutigineqarneri
@@ -120212,6 +120224,9 @@ LEXICON iar_tv !+IAR+Der/nv
 ! noun stem +IAR+Der/nv not to be combined with suffix indicated in OFF flag in stem
 !malinnaaviaqineqarlutik
 
+LEXICON lir_tv
+@U.lirtv.ON@ HTR_ir_GAQ_i ;
+
 LEXICON nngur_tv !+NNGUR+Der/nv
 @U.nngur.ON@ HTR_r_GAQ_i ;
 !malinnaavinnguineqarlutik
diff --git a/src/fst/morphology/root.lexc b/src/fst/morphology/root.lexc
index 595ffef44..f765d9726 100644
--- a/src/fst/morphology/root.lexc
+++ b/src/fst/morphology/root.lexc
@@ -333,6 +333,14 @@ TA+     !!≈ * **@CODE@** = præfiks
 @U.acro.norm@ !!≈ * **@CODE@** = acro + vanlig
 @C.acro.norm@ !!≈ * **@CODE@**
 
+! mood flags
+@U.imp.ON@
+@U.imp.OFF@
+
+! verb number flags
+@U.2pO.ON@ !2nd person object
+@U.2pO.OFF@
+
 !speller flags
 !Der/nn
 @U.ssaq.ON@
@@ -348,6 +356,10 @@ TA+     !!≈ * **@CODE@** = præfiks
 @U.iar.OFF@
 !malinnaaviaqineqarlutik
 
+@U.lirtv.ON@
+@U.lirtv.OFF@
+!affalikkap
+
 @U.nip.ON@
 @U.nip.OFF@
 !malinnaavineqineqarlutik
@@ -364,6 +376,19 @@ TA+     !!≈ * **@CODE@** = præfiks
 @U.qe.ON@
 @U.qe.OFF@
 
+@U.rar.ON@
+@U.rar.OFF@
+!ameerakkallu
+!imerakkap
+
+@U.riar.ON@
+@U.riar.OFF@
+!imeriakkap
+
+@U.tirtv.ON@
+@U.tirtv.OFF@
+!ameertikkallu
+
 @U.vip.ON@
 @U.vip.OFF@
 
@@ -980,4 +1005,4 @@ LEXICON Root !!= ## @CODE@ pointing to main parts of speech
   Forkortelser ; !!≈ - **@CODE@** 
   Akronymer    ; !!≈ - **@CODE@** 
   Pronomen     ; !!≈ - **@CODE@** 
-!  Kingumoorutit ; !Testmodel sammen med Der/Test
+!  Kingumoorutit ; !Testmodel sammen med Der/Test
\ No newline at end of file
diff --git a/src/fst/morphology/stems/nouns.lexc b/src/fst/morphology/stems/nouns.lexc
index 61c503638..5c932afd9 100644
--- a/src/fst/morphology/stems/nouns.lexc
+++ b/src/fst/morphology/stems/nouns.lexc
@@ -433,7 +433,7 @@ aaviak Z1+ssZmorf ;
 aavooq Z1Zmorf ;
 affakoq Z1Zmorf ;
 affaku Z1VZmorf ;
-affaq Z2-Zmorf ;
+affaq affaq ; !Z2-Zmorf
 affarleq Z2-Zmorf ;
 affarleriiaaq@U.Num.Pl@ Z1Zmorf ;
 affassaasaq Z1Zmorf ;
@@ -457,7 +457,7 @@ aggusti Z1VZmorf ;
 aggustusi Z1VZmorf ;
 agguut tptmorf ;
 agguutisiaq Z1Zmorf ;
-agiaq Z1+ssZmorf ;
+agiaq agiaq  ; !Z1+ssZmorf
 agiarnerluku Z1VZmorf ;
 agiartariaq Z1+ssZmorf ;
 agissaku Z1VZmorf ;
@@ -2154,8 +2154,8 @@ iffaatsoq Z1Zmorf ;
 iffasersoq Z1Zmorf ;
 iffiaarniarfik Z2-Zmorf ;
 iffiaq Z1Zmorf ;
-iffigaq Z1+kaZmorf ;
-iffikkiaq@U.Num.Pl@ Z1Zmorf ;
+iffigaq+Use/-Spell:iffigaq Z1+kaZmorf ;
+@U.Num.Pl@iffikkiaq+Use/-Spell:@U.Num.Pl@iffikkiaq Z1Zmorf ;
 iffiugaq Z1+kaZmorf ;
 iga Z1VZmorf ;
 iga+Gram/IV+TAQ+Der/vn:igaaq Z1Zmorf ;
@@ -21775,4 +21775,12 @@ muteq Z1Zmorf ;
 
 
 !symboler, som ikke findes i den genererede fil
-%:D Noun_symbols_never_inflected ;
\ No newline at end of file
+%:D Noun_symbols_never_inflected ;
+
+!######################!
+!# spell flag section #!
+!######################!
+LEXICON agiaq
+@U.nip.OFF@ Z1+ssZmorf ;
+LEXICON affaq
+@U.lirtv.OFF@ Z2-Zmorf ;
\ No newline at end of file
diff --git a/src/fst/morphology/stems/verbs.lexc b/src/fst/morphology/stems/verbs.lexc
index d1c5c97e3..6a9945999 100644
--- a/src/fst/morphology/stems/verbs.lexc
+++ b/src/fst/morphology/stems/verbs.lexc
@@ -1085,12 +1085,12 @@ amannar IV_r ;
 amar HTR_r_GAQ_si ;
 amaror IV_r_stem ; ! amaqqumik pisaqarpoq
 amassataar IV_r ;
-ameer HTR_r_GAQ_si ;
+ameer ameer ; !HTR_r_GAQ_si
 ameersalaar IV_long ;
 ameqqa@U.Num.Pl@ IV_voq ;
 ameqqaap@U.Num.Pl@ HTR_UTE_SSAQ_ssi ;
 amequsup+Orth/Arch:amequsup IV_k_stem ;
-amer HTR_ir_GAQ_i ;
+amer amer ; !HTR_ir_GAQ_i
 amerla@U.Num.Pl@ IV_voq ;
 amerlage:amerlag UDEN_HTR_schwa_SAQ ;
 amerla+Gram/IV+SI+Der/vv:amerlasi HTR_i_SAQ_si ; !amerlasillugit pissutigalugu Ondi 20240527
@@ -4309,7 +4309,7 @@ imerajuersar IV_r_stem ;
 imerajuersar HTR_r_GAQ_i ;
 imerajussi XIi_voqXmorf_stem ;
 imeratsip XIiXmorf_stem ;
-imer HTR_r_GAQ_i ;
+imer imer ; !HTR_r_GAQ_i
 imer IV_r_stem ; !agentiv
 imer+Gram/IV+TAR+Der/vv+Gram/IV+VIK+Der/vn+ARAQ+Der/nn+TUR+Der/nv:imertarfeerartor IV_r_stem ;
 imeriilip XIiXmorf_stem ;
@@ -4385,7 +4385,7 @@ iminngersorsuu IV_voq_stem ;
 iminngersuu IV_voq_stem ;
 iminnger XIirXmorf_stem ;
 iminnaap XItsXmorf_stem ;
-imip HTR_iC_TAQ_i ;
+imip imip ; !HTR_iC_TAQ_i
 imip XIiXmorf_stem ;
 imissar HTR_r_GAQ_i ;
 imissi XIi_voqXmorf_stem ;
@@ -15514,7 +15514,7 @@ qaffar HTR_r_GAQ_i ;
 qaffasip XIiXmorf_stem ;
 qaffersip HTR_C_TAQ_tsi ;
 qaffer XIirXmorf_stem ;
-qaffer HTR_r_GAQ_i ;
+qaffer+Use/-Spell:qaffer HTR_r_GAQ_i ;
 qaffia IV_voq_stem ;
 qaffii XIi_voqXmorf_stem ;
 qaffiumisaar IV_long_stem ;
@@ -17798,7 +17798,7 @@ saavissi HTR_i_SAQ_si ;
 saavitaa IV_voq_stem ;
 saavip+Gram/IV+TIP+Der/vv:saavitip HTR_C_TAQ_tsi ; !saavitillugulu piss. 20240919 OD
 saffasip XIiXmorf_stem ;
-saffer UDEN_HTR_r_GAQ ;
+saffer+Use/-Spell:saffer UDEN_HTR_r_GAQ ;
 saffiar UDEN_HTR_r_GAQ ;
 saffior IV_r_stem ;
 saffior UDEN_HTR_r_GAQ ;
@@ -24951,3 +24951,25 @@ sove V_Loan ;
 æstetisere V_Loan ;
 ætse V_Loan ;
 ævle V_Loan ;
+
+
+
+!########################!
+!# speller flag section #!
+!########################!
+LEXICON amer
+@U.tirtv.OFF@@U.rar.OFF@@U.riar.OFF@:@U.tirtv.OFF@@U.rar.OFF@@U.riar.OFF@0 HTR_ir_GAQ_i ;
+!amertikkap
+!amerakkap
+LEXICON ameer
+@U.rar.OFF@@U.2pO.OFF@@U.tirtv.OFF@:@U.rar.OFF@@U.2pO.OFF@@U.tirtv.OFF@0 HTR_r_GAQ_si ;
+!ameerakkat
+!ameerikkit
+!ameertikkap
+LEXICON imer
+@U.rar.OFF@@U.riar.OFF@:@U.rar.OFF@@U.riar.OFF@0 HTR_r_GAQ_i ;
+!imerakkap
+LEXICON imip
+@U.rar.OFF@@U.riar.OFF@:@U.rar.OFF@@U.riar.OFF@0 HTR_iC_TAQ_i ;
+!imerakkap
+!imeriakkap
\ No newline at end of file
diff --git a/test/data/typos.txt b/test/data/typos.txt
index 1124bb256..19dd3eb23 100644
--- a/test/data/typos.txt
+++ b/test/data/typos.txt
@@ -509,7 +509,7 @@ Tunngavilersuutingineqarneri	Tunngavilersuutigineqarneri
 iperartsippallattarneri	iperartippallattarneri
 tusaasaleraagakkit	tusaasaleraangakkit
 assingiinngittut	assigiinngitsut
-sammiumaassangaat	sammiumassagaat
+sammiumaassangaat	sammiumaassagaat
 angunniunnerit	anngunniunnerit
 sukkanniunnerit	sukkaniunnerit
 nr’mu	normu