diff --git a/src/dict/entec r. tziets.typ b/src/dict/Entec R. Tsiets.typ
similarity index 64%
rename from src/dict/entec r. tziets.typ
rename to src/dict/Entec R. Tsiets.typ
index c65af6b..8ae9144 100644
--- a/src/dict/entec r. tziets.typ	
+++ b/src/dict/Entec R. Tsiets.typ	
@@ -1,7 +1,7 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "Entec R. Tzietz")
+#show: conf.with(page-title: "Entec R. Tsiets")
 %dict %word
 
 = Mosici <mos>
@@ -10,6 +10,6 @@
 #mos-pro[ɛ̃dɛx aɐ̯ dʑɛdz]
 === Proper Noun <mos-1-proper>
 %mos/proper
-#mos-cit("  ")
+#mos-cit("  ")
 1. Enderjed, the man, the myth, the legend
-#mos-n("  ", pl: false)
+#mos-n("  ", pl: false)
diff --git a/src/dict/cirts.typ b/src/dict/cirtss.typ
similarity index 78%
rename from src/dict/cirts.typ
rename to src/dict/cirtss.typ
index f01d084..1cbc91d 100644
--- a/src/dict/cirts.typ
+++ b/src/dict/cirtss.typ
@@ -1,7 +1,7 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "cirts")
+#show: conf.with(page-title: "cirtss")
 %word %dict
 = Mosici <mos>
 %mos
@@ -10,7 +10,7 @@ From [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/cihyty", sn[],
 #mos-pro[ceɐ̯ts]
 === Noun <mos-1-noun>
 %mos/noun
-#mos-cit("")
+#mos-cit("")
 1. Writing, text
 2. Document, book
-#mos-n("")
+#mos-n("")
diff --git a/src/dict/contseila.typ b/src/dict/contseila.typ
deleted file mode 100644
index 7bfd694..0000000
--- a/src/dict/contseila.typ
+++ /dev/null
@@ -1,15 +0,0 @@
-#import "/templates/base.typ": *
-#import "/templates/utils/dict.typ": *
-#import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "contseila")
-%word %dict
-= Mosici <mos>
-%mos
-From #wl("/dict/contse", sn[], "mos-1-noun") #low[contse] + #wl("/dict/ila", sn[], "mos-1-verb") #low[ila]
-=== Pronunciation <mos-1-p>
-#mos-pro[qõtsiʎa]
-=== Verb <mos-1-verb>
-%mos/verb
-#mos-cit("")
-1. To present, to announce
-#mos-v("")
diff --git a/src/dict/contse.typ b/src/dict/contsse.typ
similarity index 77%
rename from src/dict/contse.typ
rename to src/dict/contsse.typ
index 3784097..47400b6 100644
--- a/src/dict/contse.typ
+++ b/src/dict/contsse.typ
@@ -1,7 +1,7 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "contse")
+#show: conf.with(page-title: "contsse")
 %word %dict
 = Mosici <mos>
 %mos
@@ -10,7 +10,7 @@ From [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/contysse", sn[
 #mos-pro[qõtsɛ]
 === Noun <mos-1-noun>
 %mos/noun
-#mos-cit("")
+#mos-cit("")
 1. Novelty, innovation
-#mos-n("")
+#mos-n("")
 
diff --git a/src/dict/contsseila.typ b/src/dict/contsseila.typ
new file mode 100644
index 0000000..a3c8bb4
--- /dev/null
+++ b/src/dict/contsseila.typ
@@ -0,0 +1,15 @@
+#import "/templates/base.typ": *
+#import "/templates/utils/dict.typ": *
+#import "/templates/utils/lang-mos.typ": *
+#show: conf.with(page-title: "contsseila")
+%word %dict
+= Mosici <mos>
+%mos
+From #wl("/dict/contsse", sn[], "mos-1-noun") #low[contse] + #wl("/dict/ila", sn[], "mos-1-verb") #low[ila]
+=== Pronunciation <mos-1-p>
+#mos-pro[qõtsiʎa]
+=== Verb <mos-1-verb>
+%mos/verb
+#mos-cit("")
+1. To present, to announce
+#mos-v("")
diff --git a/src/dict/ilamócirts.typ b/src/dict/ilamócirts.typ
deleted file mode 100644
index 4b4a070..0000000
--- a/src/dict/ilamócirts.typ
+++ /dev/null
@@ -1,16 +0,0 @@
-#import "/templates/base.typ": *
-#import "/templates/utils/dict.typ": *
-#import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "ilamócirts")
-%dict
-%word 
-= Mosici <mos>
-%mos
-From #wl("/dict/ilamós", sn[], "mos") #low[ilamós] + #wl("/dict/cirts", sn[], "mos") #low[cirts]
-=== Pronunciation <mos-1-pro>
-#mos-pro[eʎamuceɐ̯ts]
-=== Noun <mos-1-noun>
-%mos/noun
-#mos-cit("")
-1. Grammar (book)
-#mos-n("")
diff --git a/src/dict/ilamócirtss.typ b/src/dict/ilamócirtss.typ
new file mode 100644
index 0000000..1b73d1a
--- /dev/null
+++ b/src/dict/ilamócirtss.typ
@@ -0,0 +1,16 @@
+#import "/templates/base.typ": *
+#import "/templates/utils/dict.typ": *
+#import "/templates/utils/lang-mos.typ": *
+#show: conf.with(page-title: "ilamócirtss")
+%dict
+%word 
+= Mosici <mos>
+%mos
+From #wl("/dict/ilamóss", sn[], "mos") #low[ilamóss] + #wl("/dict/cirtss", sn[], "mos") #low[cirtss]
+=== Pronunciation <mos-1-pro>
+#mos-pro[eʎamuceɐ̯ts]
+=== Noun <mos-1-noun>
+%mos/noun
+#mos-cit("")
+1. Grammar (book)
+#mos-n("")
diff --git a/src/dict/ilamós.typ b/src/dict/ilamóss.typ
similarity index 62%
rename from src/dict/ilamós.typ
rename to src/dict/ilamóss.typ
index f04c5d6..78eb101 100644
--- a/src/dict/ilamós.typ
+++ b/src/dict/ilamóss.typ
@@ -1,16 +1,16 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "ilamós")
+#show: conf.with(page-title: "ilamóss")
 %dict
 %word 
 = Mosici <mos>
 %mos
-From #wl("/dict/ila", sn[], "mos") #low[ila] + [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/mōssy", sn[], "cln") #low[mōssy] (see also #wl("/dict/mósnier", sn[], "mos") #low[mósnier])
+From #wl("/dict/ila", sn[], "mos") #low[ila] + [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/mōssy", sn[], "cln") #low[mōssy] (see also #wl("/dict/móssnier", sn[], "mos") #low[móssnier])
 === Pronunciation <mos-1-p>
 #mos-pro[eʎamus]
 === Noun
 %mos/noun
-#mos-cit("")
+#mos-cit("")
 1. Grammar, language rules
-#mos-n("")
+#mos-n("")
diff --git a/src/dict/mósnier.typ b/src/dict/móssnier.typ
similarity index 78%
rename from src/dict/mósnier.typ
rename to src/dict/móssnier.typ
index d9a14f4..2fd09be 100644
--- a/src/dict/mósnier.typ
+++ b/src/dict/móssnier.typ
@@ -1,7 +1,7 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "mósnier")
+#show: conf.with(page-title: "móssnier")
 %dict %word
 = Mosici <mos>
 %mos
@@ -9,7 +9,7 @@ From [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/mōssy", sn[],
 === Pronunciation <mos-1-p>
 #mos-pro[musɲiɐ̯]
 === Noun <mos-1-noun>
-#mos-cit("")
+#mos-cit("")
 1. Convention, custom
 2. Rule (of a game)
-#mos-n("")
+#mos-n("")
diff --git a/src/dict/óasonela.typ b/src/dict/óassonela.typ
similarity index 76%
rename from src/dict/óasonela.typ
rename to src/dict/óassonela.typ
index 8c7be5f..e25506a 100644
--- a/src/dict/óasonela.typ
+++ b/src/dict/óassonela.typ
@@ -1,7 +1,7 @@
 #import "/templates/base.typ": *
 #import "/templates/utils/dict.typ": *
 #import "/templates/utils/lang-mos.typ": *
-#show: conf.with(page-title: "óasonela")
+#show: conf.with(page-title: "óassonela")
 %word %dict
 = Mosici <mos>
 %mos
@@ -10,6 +10,6 @@ From [[/worlds/Asteron/Classical Nyelaf]] #wl("/dict/ōas", sn[], "cln"
 #mos-pro[wasõnɛʟa]
 === Verb <mos-1-verb>
 %mos/verb
-#mos-cit("")
+#mos-cit("")
 1. To discover
-#mos-v("")
+#mos-v("")
diff --git a/templates/utils/lang-mos.typ b/templates/utils/lang-mos.typ
index ecd01e4..5e108d9 100644
--- a/templates/utils/lang-mos.typ
+++ b/templates/utils/lang-mos.typ
@@ -36,13 +36,13 @@
 }
 #let mos-cit(t) = [#sn(t) #html.span(class: "low", mos-translit(t))]
 #let mos-nstem(w) = {
-  if w.ends-with("") { (w.clusters().slice(0, -2).join(), "") } else if w.ends-with("") {
-    (w.clusters().slice(0, -2).join(), "")
-  } else if w.ends-with("") { (w.clusters().slice(0, -2).join(), "") } else if w.ends-with("") {
-    (w.clusters().slice(0, -2).join(), "")
-  } else if w.ends-with("") { (w.clusters().slice(0, -1).join(), "") } else if w.ends-with("") {
-    (w.clusters().slice(0, -1).join(), "")
-  } else { (w, "") }
+  if w.ends-with("") { (w.clusters().slice(0, -3).join(), "") } else if w.ends-with("") {
+    (w.clusters().slice(0, -2).join(), "")
+  } else if w.ends-with("") { (w.clusters().slice(0, -3).join(), "") } else if w.ends-with("") {
+    (w.clusters().slice(0, -2).join(), "")
+  } else if w.ends-with("") { (w.clusters().slice(0, -2).join(), "") } else if w.ends-with("") {
+    (w.clusters().slice(0, -1).join(), "")
+  } else { (w, "") }
 }
 #let mos-vstem(w) = w.clusters().slice(0, -1).join()
 
@@ -90,15 +90,15 @@
     table(
       columns: 5,
       [], base.sc[*prs*], base.sc[*pst*], base.sc[*fut*], base.sc[*gno*],
-      base.sc[*1s*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
+      base.sc[*1s*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*2s*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*3sa*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
-      base.sc[*3si*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
+      base.sc[*3si*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*1pi*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
-      base.sc[*1pe*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
+      base.sc[*1pe*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*2p*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*3pa*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
-      base.sc[*3pi*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
+      base.sc[*3pi*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*inf*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*pcp.sg*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
       base.sc[*pcp.pl*], c(s + ""), c(s + ""), c(s + ""), c(s + ""),
@@ -118,17 +118,17 @@
     table(
       columns: 6,
       [], base.sc[*age*], base.sc[*pat*], base.sc[*gen*], base.sc[*dat*], base.sc[*abl*],
-      base.sc[*1s*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*1p*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*2s*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*2p*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*3sa*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*3pa*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*3si*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*3pi*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*dem.sg*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*dem.pl*], c(h: true, ""), c(""), c(""), c(""), c(""),
-      base.sc[*q*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*1s*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*1p*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*2s*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*2p*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*3sa*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*3pa*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*3si*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*3pi*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*dem.sg*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*dem.pl*], c(h: true, ""), c(""), c(""), c(""), c(""),
+      base.sc[*q*], c(h: true, ""), c(""), c(""), c(""), c(""),
     )
   })
 }