diff --git a/doc/gf-history.html b/doc/gf-history.html
index 7b40c4d00..b59ede479 100644
--- a/doc/gf-history.html
+++ b/doc/gf-history.html
@@ -12,9 +12,37 @@ Changes in functionality since May 17, 2005, release of GF Version 2.2
 
 </center>
 
+27/6 (AR) The flag <tt>flags optimize=noexpand</tt> placed in a
+resource module prevents the optimization phase of the compiler when
+the <tt>.gfr</tt> file is created. This can prevent serious code
+explosion, but it will also make the processing of modules using the
+resource slowwer. A favourable example is <tt>lib/resource/finnish/ParadigmsFin</tt>.
+
 <p>
 
-20/6 (AR) Added the command <tt>visialize_tree</tt> = <tt>vt</tt>, to
+23/6 (HD,AR) The new editor GUI <tt>gfeditor</tt> by Hans-Joachim
+Daniels can now be used. It is based on Janna Khegai's <tt>jgf</tt>.
+New functionality include HTML display (<tt>gfeditor -h</tt>) and
+programmable refinement tooltips.
+
+<p>
+
+23/6 (AR) The flag <tt>unlexer=finnish</tt> can be used to bind
+Finnish suffixes (e.g. possessives) to preceding words. The GF source
+notation is e.g. <tt>"isä" ++ "&*" ++ "nsa" ++ "&*" ++ "ko"</tt>,
+which unlexes to <tt>"isänsäkö"</tt>. There is no corresponding lexer
+support yet.
+
+
+<p>
+
+22/6 (PL,AR) The MCFG parser (<tt>p -mcfg</tt>) now works on all
+optimized grammars - hence you need not select a weaker optimization
+to use this parser. The same concerns the CFGM printer (<tt>pm -printer=cfgm</tt>).
+
+<p>
+
+20/6 (AR) Added the command <tt>visualize_tree</tt> = <tt>vt</tt>, to
 display syntax trees graphically. Like <tt>vg</tt>, this command uses
 GraphViz and Ghostview. The foremost use is to pipe the parser to this
 command.
@@ -65,15 +93,13 @@ lin BaseC x_1 ... x_n = t
 lin ConsC x xs = t'
 </pre>
 
-
-
 <p>
 
 10/6 (AR) Preprocessor of <tt>.gfe</tt> files can now be performed as part of
 any grammar compilation. The flag <tt>-ex</tt> causes GF to look for
 the <tt>.gfe</tt> files and preprocess those that are younger
 than the corresponding <tt>.gf</tt> files. The files are first sorted
-and group by the resource, so that each resource only need be compiled once.
+and grouped by the resource, so that each resource only need be compiled once.
 
 <p>
 
diff --git a/lib/resource/finnish/ParadigmsFin.gf b/lib/resource/finnish/ParadigmsFin.gf
index 415bc75ad..e016ab1a5 100644
--- a/lib/resource/finnish/ParadigmsFin.gf
+++ b/lib/resource/finnish/ParadigmsFin.gf
@@ -20,7 +20,8 @@
 resource ParadigmsFin = 
   open (Predef=Predef), Prelude, SyntaxFin, CategoriesFin in {
 
-  flags optimize=values ;
+--  flags optimize=values ;
+  flags optimize=noexpand ;
 
 --2 Parameters 
 --
@@ -187,9 +188,9 @@ oper
 
   mkADeg : (kiva : N) -> (kivempaa,kivinta : Str) -> ADeg ;
 
---- Unfortunately, this function expands to enormous size.
+-- Without $optimize=noexpand$, this function would expands to enormous size.
 
-----  regADeg : (suuri : Str) -> ADeg ;
+  regADeg : (suuri : Str) -> ADeg ;
 
 --2 Verbs
 --
@@ -390,14 +391,12 @@ reg3N = \vesi,veden,vesi
     in
     regAdjDegr x kivempaa kivinta ** {lock_ADeg = <>} ;
 
-{- ----
   regADeg suuri =
     let suur = regN suuri in
     mkADeg 
       suur 
       (init (suur.s ! NCase Sg Gen) + "mpi")
       (init (suur.s ! NCase Pl Ess)) ;
--}
 
   mkV a b c d e f g h i j k l = mkVerb a b c d e f g h i j k l ** {lock_V = <>} ;
 
@@ -406,20 +405,21 @@ regV soutaa =
     taa = Predef.dp 3 soutaa ;
     ta  = init taa ;
     aa  = Predef.dp 2 taa ;
-    soudan = Predef.tk 2 soutaa + "en" ;
     juo = Predef.tk 2 soutaa ;
+    souda = weakGrade (init soutaa) ;
+    soudan = juo + "en" ;
     o  = Predef.dp 1 juo ;
     a = last aa ;
     u = ifTok Str a "a" "u" "y" ;
     joi = Predef.tk 2 juo + (o + "i")
   in case ta of {
-    "ta" | "tä" => vPoistaa soutaa ;
+    "ta" | "tä" => vOttaa soutaa (souda + "n") ;
     "st"        => vJuosta soutaa soudan (juo + "s"+u+"t") (juo + "t"+u) ;
     "nn" | "rr" | "ll" => vJuosta soutaa soudan (juo +   o+u+"t") (juo + "t"+u) ;
       _ => case aa of {
     "da" | "dä" => vJuoda soutaa joi ;
     "ta" | "tä" => vOsata soutaa ;
-    _ => vSanoa soutaa
+    _ => vHukkua soutaa souda
     }} ** {lock_V = <>} ;
 
 reg3V soutaa soudan soudin =