diff --git a/examples/app/app.probs b/examples/app/app.probs
index e02e17094..782d4ccf7 100644
--- a/examples/app/app.probs
+++ b/examples/app/app.probs
@@ -65056,9 +65056,9 @@ V2Q_V		0.01
 V2S_V		0.01
 V2V_V		0.01
 Phrase_Chunk	0.1
-PhrasePhr	0.8
-PhrUtt 		0.199
-ChunkPhr 	1.0e-9
+PhrasePhr	0.9
+PhrUtt 		0.09999
+ChunkPhr 	1.0e-15
 OneChunk 	0.999
 PlusChunk 	0.001
 refl_SgP1_Chunk	5.751177721092363e-4
diff --git a/lib/src/translator/DictionaryEst.gf b/lib/src/translator/DictionaryEst.gf
index bf62e45c9..c4b240ac1 100644
--- a/lib/src/translator/DictionaryEst.gf
+++ b/lib/src/translator/DictionaryEst.gf
@@ -3,7 +3,7 @@ concrete DictionaryEst of Dictionary = CatEst ** open ParadigmsEst,
   (S = StructuralEst),
   (L = LexiconEst),
   (R = ResEst),
-  MorphoEst, SyntaxEst, (E = ExtraEst), (X = ConstructX), Prelude in {
+  MorphoEst, SyntaxEst, (M=MakeStructuralEst), (E = ExtraEst), (X = ConstructX), Prelude in {
 
 flags coding=utf8 ;
 ---------------------
@@ -39,10 +39,10 @@ flags coding=utf8 ;
   during_Prep = postGenPrep "ajal" ;
   either7or_DConj = sd2 "kas" "või" ** {n = Sg} ;
   everybody_NP = makeNP (mkN "igaüks") Sg ;
-----  every_Det = mkDet Sg (mkN "iga") ;
+  every_Det = MorphoEst.mkDet Sg (mkN "iga") ;
   everything_NP = makeNP ((mkN "kõik") ** {lock_N = <>}) Sg ;
   everywhere_Adv = ss "kõikjal" ;
-----  few_Det = mkDet Sg (mkN "mõni") ;
+  few_Det = MorphoEst.mkDet Sg (mkN "mõni") ;
 ---  first_Ord = {s = \\n,c => (mkN "ensimmäinen").s ! NCase n c} ;
   for_Prep = casePrep allative ;
   from_Prep = casePrep elative ;
@@ -67,10 +67,10 @@ flags coding=utf8 ;
     isPron = False
     } ;
   less_CAdv = X.mkCAdv "vähem" "kui" ;
-----  many_Det = mkDet Sg (mkN "mitu") ;
+  many_Det = MorphoEst.mkDet Sg (mkN "mitu") ;
   more_CAdv = X.mkCAdv "rohkem" "kui" ;
   most_Predet = {s = \\n,c => (nForms2N (dSuurin "MOST")).s ! NCase n (npform2case n c)} ;
-----  much_Det = mkDet Sg {s = \\_ => "palju"} ;
+  much_Det = MorphoEst.mkDet Sg {s = \\_ => "palju"} ;
   must_VV = mkVVf (mkV "pidama" "pidada" "peab" "peetakse" "pidage" "pidi" "pidanud" "peetud") infMa ;
   no_Utt = ss "ei" ;
   on_Prep = casePrep adessive ;
@@ -304,7 +304,7 @@ lin
   -- Name of the language in that language, s/suomi/eesti/ :--P
   lin language_title_Utt = ss "eesti" ;
 
-
+  lin of_Prep = S.possess_Prep ;
 
 ----------------------
 -- Conjunctions 
diff --git a/lib/src/translator/ExtensionsEst.gf b/lib/src/translator/ExtensionsEst.gf
index a1c6803e9..076baaee8 100644
--- a/lib/src/translator/ExtensionsEst.gf
+++ b/lib/src/translator/ExtensionsEst.gf
@@ -49,12 +49,13 @@ lin
                 h = v.h ; p = v.p
                }
          ) ;
+-}
 
-  CompoundN noun cn = {
-    s = \\nf => noun.s ! 10 ++ BIND ++ cn.s ! nf ;
-    h = cn.h
+  CompoundN noun cn = lin N {
+    s = \\nf => noun.s ! NCase Sg Gen ++ BIND ++ cn.s ! nf ---- AR genitive best?
     } ;
 
+{-
   CompoundAP  noun adj = {
     s = \\_ => (snoun2nounSep {s = \\f => noun.s ! 10 ++ BIND ++ adj.s ! Posit ! sAN f ; h = adj.h}).s
     } ;