diff --git a/words/source/commentary.toml b/words/source/commentary.toml
index 020b6af44e..daacc9e24d 100644
--- a/words/source/commentary.toml
+++ b/words/source/commentary.toml
@@ -237,9 +237,9 @@ papa1 = ""
 papa2 = "Several (different?) people in 2019-2021 weirdly kept putting \"papa\" in their Reddit / Facebook posts, seemingly to promote it as a word to other people. It caused a backlash, with other people criticising the coinage, and coining other meanings for \"papa\"."
 pasila = ""
 pata = ""
-penpo = "Coined in reference to ma pona pi toki pona's \"tenpo pi toki pona taso\" event, shortening it to \"tenpo penpo\"."
 patu = ""
 pela = "A reference to Sacha Baron Cohen's interview with Noah Chomsky."
+penpo = "Coined in reference to ma pona pi toki pona's \"tenpo pi toki pona taso\" event, shortening it to \"tenpo penpo\"."
 peta = ""
 peto = "This word is deprecated by the creator."
 pi = 'The usage of "pi" to mean "of" (marking a possessor) is heavily discouraged nowadays, preferring it to only be used for regrouping within phrases.'
diff --git a/words/source/definitions.toml b/words/source/definitions.toml
index 2c1c572460..dd53fcc9c4 100644
--- a/words/source/definitions.toml
+++ b/words/source/definitions.toml
@@ -221,9 +221,9 @@ papa1 = "spinning iridium object, accelerating exponentially"
 papa2 = "father"
 pasila = "good, easy; simple, relaxed, peaceful, uncomplicated"
 pata = "sibling, brother, sister"
-penpo = "(equivalent to \"(pi) toki pona taso\")"
 patu = "the digit 8"
 pela = "dog"
+penpo = "(equivalent to \"(pi) toki pona taso\")"
 peta = "green, greenish; verdant, alive; ecofriendly"
 peto = "cry, tears; sad, sadness"
 pi = "(particle) [group the following words into one modifier for the previous word]"
diff --git a/words/source/etymology.toml b/words/source/etymology.toml
index e8de70694d..914344f48c 100644
--- a/words/source/etymology.toml
+++ b/words/source/etymology.toml
@@ -49,6 +49,8 @@ language = "Dutch"
 definition = "(indicate context for a following sentence)"
 language = "toki pona"
 
+
+[[an]]
 [[anpa]]
 definition = "below"
 language = "Acadian French"
@@ -447,6 +449,8 @@ language = "Esperanto"
 [[kolin]]
 definition = "gloopy love"
 language = "toki pona"
+
+[[kolo]]
 [[kon]]
 definition = "air, atmosphere, ambience, opinion"
 language = "Mandarin"
@@ -899,6 +903,8 @@ language = "Serbo-Croatian"
 definition = "crossroads, four-way intersection"
 language = "Vietnamese"
 
+
+[[ne]]
 [[neja]]
 definition = "(number) four"
 language = "Finnish"
@@ -1014,6 +1020,8 @@ definition = "(personifications of) dreams"
 language = "Ancient Greek"
 
 
+
+[[onono]]
 [[opasan]]
 definition = "opossum"
 language = "English"
@@ -1082,6 +1090,10 @@ language = "French"
 
 [[papa]]
 language = "English"
+
+[[papa1]]
+
+[[papa2]]
 [[pasila]]
 definition = "easy"
 language = "Acadian French"
@@ -1284,6 +1296,8 @@ language = "French"
 [[se]]
 definition = "4"
 language = "Cantonese"
+
+[[se1]]
 [[seli]]
 definition = "hot"
 language = "Georgian"
diff --git a/words/source/sp_etymology.toml b/words/source/sp_etymology.toml
index 911077409a..e858684c0b 100644
--- a/words/source/sp_etymology.toml
+++ b/words/source/sp_etymology.toml
@@ -221,9 +221,9 @@ papa1 = ""
 papa2 = ""
 pasila = ""
 pata = ""
-penpo = "toki-pona with omnidirectional emitters"
 patu = ""
 pela = ""
+penpo = "toki-pona with omnidirectional emitters"
 peta = ""
 peto = ""
 pi = "perhaps from tilted blissymbol “by”"