diff --git a/lib/src/finnish/stemmed/DictEngFin.gf b/lib/src/finnish/DictEngFin.gf
similarity index 99%
rename from lib/src/finnish/stemmed/DictEngFin.gf
rename to lib/src/finnish/DictEngFin.gf
index 8fa00472e..74269b0e8 100644
--- a/lib/src/finnish/stemmed/DictEngFin.gf
+++ b/lib/src/finnish/DictEngFin.gf
@@ -1,4 +1,4 @@
---# -path=.:..:../../abstract:../../common:../../english:../kotus
+--# -path=stemmed:.:../abstract:../common:../english:kotus
 
 concrete DictEngFin of DictEngAbs = CatFin ** open ParadigmsFin,
   (S = StructuralFin),
@@ -11523,7 +11523,7 @@ cuneiform_N = mkWN (compoundN "nuolenpää" (k39 "kirjoitus")) ;
 cunner_N = mkWN "kuparihuulikala" ;
 cunnilingus_N = mkWN "kunnilingus" ;
 cunning_N = mkWN (k1A "vaihto") ;
-cunt_N = mkWN (k9 "viiva") ;
+cunt_N = mkN "vittu" ; -- CHECKED
 cup_N = mkWN (k5A "kuppi") ;
 cup_V2 = mkWV2 (k58 "laskea") "verta" ;
 cup_final_N = mkWN (compoundN "cup-" (k6 "finaali")) ;
@@ -13060,7 +13060,7 @@ dichroism_N = mkWN (compoundN "kaksi" (k40 "värisyys")) ;
 dichromacy_N = mkWN (compoundN "väri" (k40 "sokeus")) "osittainen" ;
 dichromat_N = mkWN "osittaisvärisokea" ;
 dichromatic_A = mkWA (compoundA "kaksiväri" (k38 "näköinen")) ;
-dick_N = mkWN (k10 "muna") ;
+dick_N = mkN "kulli" ; -- CHECKED
 dickens_N = mkWN (k48 "perkele") ;
 dicker_V = mkWV (k52 "hieroa") "kauppoja" ;
 dickey_N = mkWN (compoundN "irto" (k39 "etumus")) ;
@@ -34134,9 +34134,9 @@ piscatorial_A = mkWA "kalastus-" ;
 piscine_A = mkWA "kala-" ;
 piscivorous_A = mkWA "kaloja" "syövä" ;
 pisiform_N = mkWN (compoundN "herne" (k18 "luu")) ;
-piss_N = mkWN (compoundN "pis" (k38 "saaminen")) ;
-piss_V = mkWV (k53A "heittää") "vettä" ;
-piss_V2 = mkWV2 (k53A "heittää") "vettä" ;
+piss_N = mkN "kusi" "kusia" ; -- CHECKED
+piss_V = mkV "kusta" ; -- CHECKED ---WV (k53A "heittää") "vettä" ;
+piss_V2 = mkV2 "kusta" ; -- CHECKED -- ?? transitive ? --- mkWV2 (k53A "heittää") "vettä" ;
 pisser_N = mkWN (k48A "tilanne") "paskamainen" ;
 pistachio_N = mkWN (k5 "pistaasi") ;
 piste_N = mkWN (k9A "rata") ;
@@ -41220,7 +41220,8 @@ shirtwaist_N = mkWN (compoundN "paita" (k2 "pusero")) ;
 shirtwaister_N = mkWN (compoundN "paita" (k2 "pusero")) ;
 shirty_A = mkWA (k38 "kiukkuinen") ;
 shish_kebab_N = mkWN (k5 "kebab") ;
-shit_V = mkWV (k73A "kakata") ;
+shit_N = mkN "paska" ; -- CHECKED
+shit_V = mkV "paskantaa" ; -- CHECKED
 shittah_N = mkWN (compoundN "akaasia" (k18 "puu")) ;
 shittimwood_N = mkWN (compoundN "akaasia" (k18 "puu")) ;
 shiv_N = mkWN (k1A "puukko") ;