diff --git a/dictsource/af_list b/dictsource/af_list
index c8b432f9..24be1997 100755
--- a/dictsource/af_list
+++ b/dictsource/af_list
@@ -157,7 +157,9 @@ tunisië     $2
 turkye      $2
 upington    apiNt@n
 vesuvius    v@su:viWs
+viëtnam     vj'Etnam
 wellington  wEliNt@n
+wolseley    wulsli
 worcester   v'ust@r
 zimbabwe    zI:mb'ab_wE
 
@@ -275,6 +277,7 @@ matthéüs    mat'i:Ws
 melanie     m@lA:ni
 meraai      m@rAI
 messias     m@sijas
+michael     _^_EN
 michelle    miS'&l
 michiel $2
 miriam      mIri@m
@@ -322,6 +325,7 @@ terblanche  t@rblA:nS
 theron tr'On
 toerien     $2
 trudie      trudi
+versfeld    f&rsf&lt
 viljoen     $2
 villiers    vIli@rs
 vincent     _^_EN
@@ -763,6 +767,7 @@ sodoende      s'o@d,und@
 sogenaamde    s'o@x2@n,A:md@
 sononder      sOn_On@r
 sonop         sOn_Op
+sonore        sun'o@r@
 sover         so@f&r
 stabiel       stab'il
 staccato      $2
@@ -785,6 +790,7 @@ vakant        f%ak'ant
 vakante       f%akant@
 vanaf         fanaf
 vandat      $1
+vanmelewe     fanm@l'e@v@
 vanne         fan@
 veraf         f&r_af
 verafgeleë    f&rafx2@le@@
@@ -804,6 +810,7 @@ vers          f&:rs
 verste        f&rst@
 verte         f&rt@
 vertes        f&rt@s
+verweg        f&:rv&x2
 via           via
 volheid       $1
 volte         $1
@@ -822,8 +829,11 @@ vrek          fr&k
 waarskynlik   $2
 waarskynlike  $2
 wangedrag     vanx2@drax2
+watwo         vatvo@
+watwou        vatv@U
 weergalm      $2
 weerklink     $2
 weggewens     v&x2@v'E:ns
 welaf         v&l_af
-weleer        v&l_'e@r
\ No newline at end of file
+weleer        v&l_'e@r
+wysgere       veIsx2e@r@
diff --git a/dictsource/af_rules b/dictsource/af_rules
index f6fffffa..7a9f894a 100755
--- a/dictsource/af_rules
+++ b/dictsource/af_rules
@@ -157,7 +157,7 @@
              a (gonie     %a // fix 1st a sound and move default stress: agonies/-e
              agonie (_N   %ax2%uni // move stress to end: agonie
              agter (bak   %ax2t@r // fix stress: agterbaks/-e/-heid
-             agter (e     ''ax2t@r- // force stress to 1st slb, insert short pause: agterent/-e
+          _) agter (en    ''ax2t@r_ // force stress to 1st slb, insert short pause: agterent/-e
           _) agterge (@P7  'ax2t@rx2@
              agter (midda  %ax2t@r // fix stress: agtermiddag/-s/agtermiddae
              agterna      ax2t@rn'A: // agterna/-kyk/-loop/-sit/-staar
@@ -222,8 +222,9 @@
              a (tomA      %a // fix stress and a sound: atome/(sub)atomies
           @) ator (K      'A:tOr // katalisator/diktatorskap and many similar
           @) atories      %at'o@ris // stress on -ories: diktatories/organisatories/resperatories, etc.
+             atrium       A:triWm // fix a sound: atrium and compounds
           K) au           @U // trauma/-ties/Aucamp/Paul/-a/-us
-             augustus     Ox2'WstWs
+             augustus     %Ox2WstWs
              avokado      %af%ukA:du // stress and o sounds
              avokade      %af%ukA:d@ // variant form of avokado
           C) a (xA+       a // shorten a before x: taxi and compounds/praxi/saxofoon 
@@ -313,7 +314,6 @@
              b (_N        p
              b (eentjie++ b // exception to "bee" rule: beentjie/-s and compounds
              bagasie      b@x2A:si // shorten 1st a: bagasie and compounds
-             baaierd      bAI:@rt // fix e sound: baaierd/-s
           @) baarlik      b'A:rl@k // move default stress: wonderbaarlik/-e/-heid/-ste
              bajo (net    b%aj%u // fix stress and vowel sounds: bajonet/-te and compounds
              bakate (l    b%ak@t& // fix stress and vowel sounds: bakatel/-le/-letjie
@@ -424,6 +424,7 @@
              byder (C@    b%eId@r // byderhand/-s/byderwets
              by (een      b%eI_ // move default stress: byeen/byeenkoms/-te, etc.
              byge (low    b%eIx2@ // move default stress: bygelowig/-e/-heid
+          _) by (telP2    b'eI // fix e sound: bytel/-ling/-lery
              by (voorb    b%eI// move default stress
 
 .group be
@@ -435,6 +436,7 @@
           _) be (@P2      b@
           @) be (C        b@
              bene (dy     b%e@n@ // fix stress and e sounds: gebenedy/-de
+             beni (g      be@n@ // fix stress and e sound: (swaar/twee/vier)benig, etc.
           C) be (rsie     b'&: //kombersie etc.
              bene (r be@n@ //benerig/e
              be (C%+      bE // beffie/bessie/bennie/bettie/blombeddings
@@ -456,6 +458,7 @@
              bedes (_     be@d@s // bedes/seënbedes, etc.
              bedel        be@d@l // bedel/gebedel/bedelaar
              bedeling     b@de@l@N //bedeling and compounds
+             bede (str    be@d@ // fix stress and e sounds: bedestring/-e and compounds
              bedev        be@d@f // bedevaart and compounds
              beger (A     b@x2e@r // begerig/begerend and compounds
              bek (f       b&k // fix stress and e sound: bekfluitjie/-s/-musiek, etc.
@@ -594,6 +597,7 @@
              deur (sigt   d%y@r // move default stress: deursigtig/-e
              deur (skynA   d%Y@r // move default stress: deurskynend/-e
              deur (skynde d%Y@r // move default stress: deurskynde
+             deur (soek   d%Y@r // move default stress: deursoek/-ing
              deurspek     d%y@rspEk // fix stress and 2nd e: deurspek/-te
              deur (weeC   d%y@r // move default stress: deurweef/deurweek/-te
              deur (winter d%y@r // move default stress: deurwinter/-de
@@ -634,7 +638,7 @@
              debu (te@    d%Eb%y // fix stress and e sound: debuteer/debutering
              debuut       d@b'yt  // debuut/-bundel/-vertoning
              dee (moedig  d%e@ // move default stress: deemoedig/-e/-er/-ste/-heid/-ing
-             desember     de@s'Emb@r
+             desember     d%e@sEmb@r
              digers       d@x2@rs
              departe (ment d@p%art@
              deposito     d@pOsitu // stress and vowel sounds: deposito and compounds
@@ -663,6 +667,7 @@
           @) ds (_        ts // fix d sound of wrds ending in -ds: buitentyds, etc.
         hon) d (C         t // fix d sound: hondriem/-reuk/-ruik
          oo) d (r         t // fix d sound: broodrooster/doodryp/loodreg/noodroep
+        win) d (r         t // fix d sound: windrigting/-s and compounds/windreën
           p) d (C         d // oopdwing/koopdwang
         ver) d (C         d     // verdwyn; see rule: @) d (C         t
           @) dd           d // beddens/bedding
@@ -695,7 +700,11 @@
              e (C         E
         CAC) e (CC        @ // fix e sound: nalatenskap/wapenstilstand
         CAC) e (C%        E // beesfilette/nougesette/onderbesette/voortgesette
+       CACp) e (rl        @ // fix e sound: werperligte/wimperloos
         CAC) e (rr        @ // fix e sound: koperring/-rooi/nederryn/somerreën/-rok/superrealis/syferrekenaar...
+        aai) e (rC        @ // fix e sound: baaierd/waaierstert/compounds starting with baaiers-
+      bloup) ers          &:rs // fix e sound: bloupers
+      treil) e (rC        @ // fix e sound: (vis)treilerkaptein/-wrak and similar compounds
        hond) e (@         @_ // fix e sound: hondebloed/-oor/-trou, etc.
         kod) e (C         @ // fix e sound: kodenommer/kodetaal/kodewoord, etc.
        Cond) e (CA        @ // blondekop/geskondenes/hondebelasting and many compounds/sondebok/sondelas
@@ -709,11 +718,12 @@
        spok) e (C         @ // fix e sound: compounds beginning with spoke: spokebeeld/-lywe/-dans
        styw) e (C         @ // fix e sound: stywepas/stywesiek/-te
        blak) e (r         @ // fix e sound: blakerend/-e/blakering
+         rm) e (rtjie     @ // fix e sound: beskermertjie/hervormertjie/verwarmertjie and similiar diminutives
       skilf) e (r        @ // fix e sound: skilferagtig/skilferdeeg/-kors/afgeskilferde/verskilfering
         syf) e (r         @ // fix e sound: (be-/in-/ont-/uitsyfering
          @C) erf (_       &rf // fix e sound: bokerf and similar
          @C) erwe (_      &rv@ // fix e sound: plurals: randerwe and similar
-        CAC) e (rkK       & // fix e sound: deurgewerk; exception to: CAC) e (CC        
+        CAw) e (rkK       & // fix e sound: deurgewerk/-te; exception to: CAC) e (CC        
         CAp) e (rkC       @ // fix e sound: hiperkrities/koperkleurig/koperknope
         CAw) e (rkA       & // buitewerker/bywerking/genadewerking/grondbewerking/klerewerker/nawerking...
          yw) e (rA        @ // fix e sound: beywering/skryweragtig
@@ -732,6 +742,7 @@
           _) epi (C       %Ep%i //episode and others
        halw) e (K        @ // fix e sound: halwemaan/halwerweë/halwes
       liefd) e (C         @ // fix e in compounds starting with liefde: -blyk/-daad/-diens/-gawe/-groete/-werk, etc.
+        mal) e (dy        @ // fix e sound: vermaledy/-de and other derivitives
          sp) e (d         @ // ekspedisie/gaspedaal/kwispedoor
         gev) e (gK        & // fix e sound in compounds like buitegevegstelling/skietgevegte
         CAC) e (gg        & // fix e sound: bylegging/delgingsfondsbelegging/langtermynbelegging
@@ -745,7 +756,7 @@
          @k) e (lde_      @ // fix e sound: gekronkelde/(ge/ver)kreukelde
          mp) e (lde_      @ // fix e sound: gemompelde/oorrompelde/verskrompelde and similar
          Ap) e (ling      @ // fix e sound: skepeling/compounds of sypeling
-         @C) e (lk_       & // fix e sound: many compounds ending in kelk/melk
+         @C) e (lk_+      & // fix e sound: many compounds ending in kelk/melk
          @C) e (lke_      & // fix e sound: many compounds ending in -elke: blomkelke, etc.
         uiC) e (K         @ // fix e sound in wrds like: bruidegom/druipeling/duinebesie/duisendpoot/kruisement...
          yd) e (l         @ //ydel e sound in compounds verydeling
@@ -758,7 +769,9 @@
           l) ens (_       E:ns // fix e sound: kamaralens/wyehoeklens/kontaklens and similar
           l) ense (_      E:ns@ // plurals: kamaralense/wyehoeklense/kontaklense
         AAl) ens (_       @ns // fix e sound: meulens and compounds
+       vaCk) e (nC        @ // fix e sound: Valkenburg/varkensgras/-kos, etc.
         vel) ens (_       @ns // fix e sound: vervelens
+       vull) ens (_       @ns // fix e sound: vullens and compounds
          @k) e (nskap     @ // fix e sound: dronkenskap and derivitives
         pot) e (nC        E // fix e sound: potensieel/potensiële
          Cp) ens (+      Ens // fix e sound: beespens/grootpens/melkpens/sikspens/skaappens/varkpens/trippens/vaalpens
@@ -766,6 +779,7 @@
              ensiklope    %Ens%ikl%up@ // fix stress and vowel sounds: ensiklopedie and compounds
              entoesia     %Ent%us%i;a // move default stress: entoesias/-te/-me
           C) e (pan       @ //fix e sound: instrumentepaneel/kolepan/liefdepand
+       Celm) e (tK        @ // fix e sound: helmet/pelmet and compounds
          @k) e (tt@+      E // menseketting/etikette
          sp) e (lonk      @ // spelonk/rowerspelonk/spelonkagtig etc.
          _k) e (ndh      =E // but bekendheid/onbekendheid
@@ -825,6 +839,7 @@
          nl) eer          e@r // restore default stress: kernleerplan and compounds
          rl) eer          e@r // move default stress: agterleer/burgerleer/kelderleer/solderleer
          sl) eer          e@r // words containing sleer take default stress: seemsleer/volstruisleer
+         ep) eer          e@r // default stress: (harde-/wilde-)peer and compounds
          Cs) eer          e@r // words containing seer (meaning pain) take default stress
          ks) eer          'e@r // annekseer/indekseer/lakseer/takseer and their compounds
          ss) eer          'e@r // but many words cont. sseer take stress:  adresseer, etc.
@@ -1048,10 +1063,10 @@
           C) ensies       'Ensis // forensiese
           @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaardig
          @C) ent (K       'Ent // orent/student/presidentsrede
+         @C) ent (e_      'Ent // plurals of some of the above###
          en) ent (_       Ent // restore default stress: koppenent/voetenent
          pr) ent (+       Ent // default stress for compounds of prent
          @s) ent (rA      Ent // winkelsentrum/studentesentrum, etc.
-         @C) ent (e_      'Ent // plurals of some of the above
           C) er (tyd      @r // tegelykertyd/kindertyd/indertyd
           _) etens        'e@t@ns // etenstyd/klok/tafel/uur
        pann) e (C         @ //pannekoek and friends
@@ -1142,7 +1157,7 @@
              fasiliteit   fasilit'eIt  // fasiliteit/e/aftrekorderfasiliteit
              fa (ta@      f%a //fix stress and 1st a sound: fatale/fatalis/-me/-te/-ties
              fat (soen    f%at // move default stress: (on)fatsoen(lik)
-             februarie    f'e@bry,A:ri
+             februarie    fe@bry,A:ri
              feite        feIt@ // fix 2nd e sound: feitebepaling/-bevinding/-bron/-fout/-kennis/-lik
           @) fel (end     f@l // betwyfelend/skuifelend/weifelend
           @) fel (ing     f@l // betwyfeling/skuifeling/weifeling
@@ -1224,6 +1239,7 @@
           A) goog (_      x2'o@x2 // demagoog/pedagoog
              gor (dyn     x2%Or // move default stress: gordyn and compounds
           A) goë          x2'u@ // demagoë/pedagoë
+             grade (C     x2rA:d@ // fix e sound: gradedagseremonie/-dae/-lyn/retrogradewoordeboek
              grade (ring  x2r%ade@ // fix stress and vowel sounds: gradering and many compounds
              gra (fiek    x2r%a // fix stress and a sound: grafiek/-e /lyngrafiek, etc.
              gra (fiet    x2r%a // fix stress and a sound: grafiet and compounds
@@ -1405,6 +1421,7 @@
              hong (a      h%ONx2 // Hongaar/Hongare/Hongaarse
              ho (nneur    h%O // move default stress: honneurs/-graad, etc.
              hoog (dra    h%o@x2 // stress: hoogdrawend and derivitives
+             hoog (moedig h%o@x2 // move default stress: hoogmoedig/-e/-heid
              horison (ta  h%o@r%is%On // move default stress: horisontaal/horisontale
              hor (los     h%Or // horlosie and compounds
              hor (mo      h%Or // move default stress: hormoon/hormone and compounds
@@ -1607,7 +1624,7 @@
           _) ja (nnA+     ja // restore default stress: Janna/Jannie/Janneman, etc.
           _) jan (sAnK    jan // restore default stress: Jansen/Janson/-s
           _) j (antjieK++  j // fix a sound: Jantjie/-s
-             januarie     j'any,A:ri
+             januarie     jany,A:ri
              japo (n      j%apO // fix stress and shorten a sound: japon/-ne and compounds/japonika
              jas (myn     j%as // move default stress: jasmyn and compounds
              jean         _^_EN
@@ -1622,8 +1639,8 @@
              jonge        jON@ // jongeling/jongeres
              jong (etjie  jON // fix e sound: jongetjie/-s
 
-             junie        j'uni
-             julie        j'uli
+             junie        juni
+             julie        juli
              juris (dik   j%ur@s // jurisdiksie and compounds
              ju (we       j%y // juweel/juwele and compounds
              juwe (lier   j%yv@ // stress and vowel sounds: juwelier and compounds
@@ -1648,6 +1665,7 @@
           n) kerende (_   k@r@nd@ //hunkerende and others
              kerker       k&rk@r // fix e sounds: gekerkerde/inkerkering/kerkermuur, etc.
       weder) ker (A       k'e@r // wederkerend/wederkerig
+             kete (l      ke@t@ // fix e sounds: stookketel/ketelmaker and many similar compounds
           _) keuse        k''Y@s@ // fix connecting e sound in compounds starting with keuse
              kiaat        k%i;A:t // move default stress: kiaat and compounds
              kilimandjaro k%il@m%andZA:ru // fix stress and vowel and "dj" sounds: kilimandjaro and compounds
@@ -1707,6 +1725,7 @@
           @) kundi (g     k'Wnd@ // wiskundige/onoordeelkundigheid and many similar
              kurwe        kWrv@ // fix e sound: kurwes/skurwebas/skurwebek/skurwepadda
           i) kus          k'Ws // chemikus/historikus/politikus, etc.
+          _) kw           kw // fis w sound in kw combination at start of word/after prefix: weggekwynde, etc.
              kwaad (aardi kw%A:t_ // move default stress: kwaadaardig/-e/-heid
              kwa (dra     kw%a // move default stress: kwadraat/kwadrate
              kwali (C@    kw%al%i // kwaliteit/kwalifiseer
@@ -1773,6 +1792,7 @@
              kara (koel   k%ar%a // fix stress and a sounds: karakoel and compounds
              kara (va     k%ar@ // move default stress: karavaan/karavane
              ka (ros      k%a // a short, unstressed: karos/-se and compounds
+             kartets      k%artEts // fix stress and e sound: kartets/-e and compounds
              kar (ton     k%ar // move default stress: karton and compounds
           _) kar (ve      k%ar // move default stress: karveel/karvele
              kar (ver     kar // restore default stress: karverkoper/-verhuurder, etc.
@@ -1894,7 +1914,7 @@
              lanfer       lA~mf@r // fix e sound: lanferdoek/-vlae, etc.
              lam (len     l%am // move default stress: lamlendeling/lamlendig/-e/-heid
              lande (ry    l%and@ // move default stress: landerye/compounds of landery-
-          _) lang (d      l%aN // langdradig/langdurig and their derivitivs
+          _) lang (d@@    l%aN // langdradig/langdurig and their derivitivs
           _) lange (CA    laN@ // e sound: langelaas/Langeberge
              lang (werp   l%aN // move default stress: langwerpig/-e/-heid
              lank (moe    l%aNk // move default stress: lankmoedig/-e/-heid
@@ -1958,7 +1978,7 @@
              lug (A       lWx2? // lugaanval/lugafweer/lugopname
              luid (rugt   l%Yyd // move default stress: luidrugtig/-e/-heid
              luite (nant  l%Yyt@ // fix e sound and move default stress: luitenant and compounds
-             luk (salig   l%Wk // move default stress: geluksalig/-e/-heid
+             luksa (lig   l%Wks'A: // move default stress: (wel)geluksalig/-e/-heid
              lu (kwart    ly // fix u sound: lukwart and compounds
              lu (mier     l%W // fix stress and u sound: lumier and compounds
              lupine       l%upin@ // fix u sound: lupine/-veld and similar
@@ -1970,7 +1990,7 @@
 .group m
              m            m
              m (m
-          _) made (l      m%A:d@ // move default stress: madeliefie/-s
+             made (lie    m%A:d@ // fix stress and e sound: madeliefie/-s/watermadeliefies
           _) ma (d        m%a // fix stress and 1st a sound: madonna/-s/-beeld/-lelie/Madiba/Madras
              maga (syn    m%ax2%a // magasyn and many compounds
              magi (stra   m%ax2%i // magistraat and many compounds
@@ -2254,7 +2274,7 @@
              no (stalgie  n%O // stress on 2nd slb.: nostalgies
              note (b      no@t@ // fix e sound: notebalk/-e/-bank/-beurs
              no (velle    n%u // move default stress and fix o sound
-             november     no@f'Emb@r // fix 1st e sound and stress: November and compounds
+             november     n%o@fEmb@r // fix 1st e sound and stress: November and compounds
              ntere (ss    nt;r@' // interessant/interesseer/geïnteresseerd
              n (tjie      N // breintjie/fonteintjie/kleintjie
          oe) ng           n;x2 //soengroet, pensioengewend etc.
@@ -2433,7 +2453,7 @@
              ovu          %Ov%y // fix stress, o and v sounds: ovulasie/ovuleer
              ower (@      o@v@r // lowergroen/betowerend/dowerig/compounds of owerheid
              ower (spelig %o@v@r // move default stress: owerspelig/-e
-             oë           u@ //
+             oë           u:@ //
 
 .group on
 // The following are experimental nasalisation of ons
@@ -2576,7 +2596,7 @@
              oor (meester %o@r // move default stress: oormeester
           _) oor (peins   %o@r // move default stress: oorpeins/-ing
              oor (reed    %o@r // move default stress
-             oor (redA    %o@r // move default stress: oorredingskrag
+             oorre (dA    %o@re@ // move default stress: oorreding/-skrag/-vermoë
              oor (rompel  %o@r // move default stress
           _) oor (skadu   %o@r // move default stress: oorskadu/-wing
           _) oor (skat    %o@r // move default stress: oorskat/-te/-ting
@@ -2646,6 +2666,7 @@
              pa (trA      p%a // patrollie/patroon/patrys
              patri (@     p%atr%i // move default stress: patriarg/patriot/-te and derivitives
              patriar (ga  p%atr%i%ar // move default stress: patriargaal/-gale
+             paté         p%ate@ // fix stress and vowel sounds: (lewer)paté, etc.
              pa (Ciljoe   p%a% // fix stress: pawiljoen/paviljoen/-e and compounds
              polio        po@li;u // polio and compounds
           _) peli (ka     p%El%i // move default stress: pelikaan/pelikane
@@ -2659,6 +2680,7 @@
           _) perde        p'&:rd@
           @) perde (_     p&:rd@ // compounds ending with perde
          pe) perde (_     p@rd@ //gepeperde, ongepeperde
+        pur) perde (_     p@rd@ // fix e sound: verpurperde
         ras) perde (_     p@rd@ //gerasperde and compounds
      snip) perde (_       p@rd@ //words ending in snipperde
         tem) perde (_     p@rd@ //words ending in temperde
@@ -2666,10 +2688,12 @@
        skam) pere (_      p@r@ ?? shorten 1st e in ending
              perfek       p@rfEk // perfek/-te/-sie/-sionis
              peri (o      p%e@r%i; // stress: periode/-s and compounds
+             peripa (t    pEripa'' // fix stress and vowel sounds: peripateties/-e/peripatetikus/-se/peripatetici
              peri (stal   p%Er@ // fix stress and vowel sounds: peristalties/-e/peristaltiek
              per (kussie  p@r // fix stress and e sound: perkussie and compounds
              perle (moe   p%&rl@ // move default stress: perlemoen/perlemoer and compounds/reperkussie/-s
              pe (rron     p@ // move default stress and fix e sound: perron and derivitives
+             perske       p&rsk@ // fix e sounds: perskeblatjang/-bloeisel/-brandewyn/-konfyt/gladdeperskes/geelpersketyd
           r) peling (_    p@l@N //verwerpeling etc.
               peloton     pEl@t'On
              permanen     p&rman'En // permanent/e/permanensie
@@ -2913,7 +2937,7 @@
          &A) reel (_      r'e@l // stress: immoreel/kultureel/struktureel/tekstureel/temporeel
              reti (re     r@t@ // fix stress and vowel sounds: retireer/retirerende
           _) retro (@     r%Etr%u // fix stress and vowel sounds: many words beginning with retro-: retrogressie/-f, etc.
-             re (ü        r%i_ // fix stress and e sound, insert pause: reünie/-s and compounds/reünifikasie
+             re (ü        r%i_ // fix stress and e sound, insert pause: reü¼nie/-s and compounds/reünifikasie
 
 
 .group s
@@ -2938,6 +2962,7 @@
           @) sj (aar      sj // diensjaar/lewensjaar/begrotingsjaar
           @) sj (aCA      sj // apartheidsjare/oesjare/beroepsjaloesie
           @) s (joern     s // split -sj-: fabrieks-/reis-/skeepsjournaal, etc.
+          @) s (jonC      s // split sj: bruidsjonker/herdersjonge/kajuitsjonge/skeepsjonge/varsjonk
              sigare (t    s@x2%arE // fix vowel sounds and move default stress
              sig (a@      s@x2 // sigaar/sigare/sigaardosie
           _) si (klo      s%i // fix stress and i sound: sikloon/siklone/sikloop/siklope
@@ -2950,6 +2975,7 @@
              sinteties    s@nte@tis // sinteties/e/fotosinteties/-e
              si (viel     s@ // move default stress and fix i sound: siviel/-e
              s (iën       S
+          _) sebra        se@bra // fix vowel sounds: sebra/-strepe; variant of zebra
              selek (CA    s@lEk //seleksie selekteer etc.
              sending (_   sEnd@N //fix sending at word end
 
@@ -2960,6 +2986,7 @@
           _) sa (ff       sa'' // move default stress: saffier and compounds/saffraan/-agtig/-peer
              sag (moe     s%ax2 // move default stress: sagmoedig/-e/-heid
              salaris      s@lA:r@s // salaris/aanvangsalaris/salarisskaal/-uitbetaling
+             salvo (K     salv%u // fix v sound: (geweer)salvo/-'s and similar
              sal (mander  s%al // fix stress: salmander/-s/klipsalmander
              salo (n      s%alO // eetsalon/haarkappersalon
              sal (peter   s%al // move default stress: salpeter and compounds
@@ -2974,6 +3001,7 @@
              sar (kA      s%ar // move default stress: sarkasme/sarkasties/sarkoom
              sa (rong     s%a // fix stress and a sound: sarong/-s
              sa (tir      s%a // move default stress: satire/satiries/-e
+             sa (turnu    s%a // fix stress and a sound: saturnus and compounds
           _) schu (C      Su // fix u sound: Schubert/Schultz/Schumann/Schumacher
           _) sede         se@d@ // sede/-s|-preek
              se (duk      s@ // fix stress and e sound: seduksie/-s/seduktief
@@ -3048,6 +3076,7 @@
           @) sering       s'e@r@N    // analisering/kategorisering
           @) ses (_       s@s // fix 2 slb. words ending in ses
              sma (rag     sm%a // fix stress and a sound: smarag/-te
+             snaper (ing  snA:p@r // fix stress and vowel sounds: versnapering/-e/-s and compounds
              snel (_      sn&l // fix e: aansnel/agternasnel/blitssnel/heengesnel/koppesnel/nasnel/verbysnel
              sodom (iet   s,o@dOm // fix stress
              soewe (nier  s%uv@ // move default stress: soewenier/-e/-s
@@ -3085,7 +3114,7 @@
              self (_      s'&lf // myself/vanself
 //             self         s'&lf
           K) sewe (C      s'e@v@ // sewejarige/standerdseweklas
-             september    s@pt'Emb@r
+             september    s@ptEmb@r
           @) sief (_      s'if // massief/aggressief/passief/intensief
           @) siewe (_     s'iv@ // massiewe/aggressiewe/passiewe/intensiewe
           _) sieke        sik@ // siekeboeg/-fonds/-lys/-lokaal/-loon
@@ -3123,7 +3152,6 @@
              spesialis (A spESialis
              spesialis    spESal'Is
              spesi (f     sp%Es%I // spesifiek/spesifiseer
-         @@) spre (ken    spr'e@ // stress: vanselfsprekend
              stede (C     ste@d@ // fix e sounds of many compounds and derivitives containing stede
      dubbel) ste (r       st& // fix e sound: dubbelster/-re
       dwaal) ste (r       st& // fix e sound: dwaalster/-re
@@ -3131,6 +3159,7 @@
          nd) ste (r       st& // fix e sound: aandster/oggendster
        pool) ste (r       st& // fix e sound: poolster
         see) ste (r       st& // fix e sound: seester/-re/seesterpunte and similar compounds
+       sewe) ste (r       st& // fix e sound: sewester and compounds
           _) ste (ri      st%E // fix stress and e sound: steriel/-e/steriliteit
              stimu (lA    st@m%y // move default stress and fix i sound: stimuleer/stimulering/stimulasie
           _) sub (a       sWb_ // subagent/subartikel/subatomies, etc.
@@ -3308,6 +3337,7 @@
           _) trak (ta     tr%ak // move default stress: traktaat/traktate
           _) trans (@P5   tr%ans // transatlanties/transformasie/transoranje/Transvaal, etc.
           _) trans (aksie tr%ans // remove small break: transaksie/-s and compounds
+          transendent (A  tr%ans%End%Ent // fix stress and vowel sounds and remove short break: transendenteel/-tele/-taal
              trap (soe    tr%ap // move default stress: trapsoetjies/-e
              traw (a      trav' // trawant/e/trawal
           &) treding      tre@d@N  // betreding/uittreding
@@ -3347,6 +3377,7 @@
              tea (tra     t%i%a // fix stress and vowel sounds: teatraal/teatrale
              teen (argu   t''e@n // forse stress on 1st slb.: teenargument/-e/-asie
              teen (oorges t%e@n_ // move default stress: teenoorgestel/-d/-e
+         @A) te (geC      t@ // fix e sound: Hugenotegemeente/stategebou and similar compounds
          @C) te (gn       t& //tegniek/iese and friends 
           _) tekere       t@ke@r@ // move default stress and correct e sounds
              teks (tiel   t%Eks // move default stress: tekstiel and compounds
@@ -3369,6 +3400,7 @@
              teks (+      tEks // compounds with teks
              tempel       tEmp@l // fix e sounds: afgodtempel/Hindoetempel/kultuurtempel/tempelbewaarder/tempeldienaar
              tent (_      tEnt //suurstoftent and others
+             tente (_     tEnt@ // (suurstof-/wa-)tente and similar
              te (oo       t@ // geboorteoorskot/kosteoorweging/siekteoorsaak/terroristeoorlog
           _) teraarde     t%&r?A:rd@ // move default stress and fix e sounds: teraardebestelling/-s
           &) terd (_      t@rt // fix e sound: beteuterd/gelouterd/stouterd
@@ -3414,14 +3446,14 @@
 
           &) tel (_       t@l
              teleur       t@lY@r    // teleur/teleurstelling/teleurgesteld
-          &) tels (_S4    t@ls
+          &) tels (_      t@ls
        sleu) tel          t@l //sleutel in compounds
              te (l        t&
+         CA) te (lend     t@ // fix e sound: (af)ratelend/-e
          &A) te (lp       t@ // fix e sound: beitelpunt/ketelpak/ketelplaaat/titelplaat and similar
           A) te (ling     t@ // betiteling/insluiteling/loteling/uitbeiteling/verstoteling
              teltjie      t@lki
           @) tel (o       t@l // hartelose/besluiteloos/gedagtelose
-         ke) te (l        t@ // fix 2nd e sound in many compounds with ketel
              tendens      t%Ende~ns // fix stress and e sounds: tendens/-e and compounds
           &) tert (A      t@rt // fix e sound: agtertoe/foltertuig/gietertuit/kilometertoelae/lastertaal/letterteken
           &) tert (r      t@rt // fix e sound: pleistertroffel/venstertralie/ystertralies/ystertrap
@@ -3481,16 +3513,18 @@
              uiteindeli   %YyteInd@l@ // move default stress: uiteindelik/-e
              uiter        Yyt@r // uit- not prefix: uiters/uiterlik/uitermate
              uitgee (+     'Yytx2e@ // se rule: _) uitge (@P5   Yytx2@
-             uit (kansel  ''Yyt // enforce stress on 1st slb: uitkanselleer
+             uit (huisig  %Yyt // move stress: uithuisig/-e/-heid
+             uiting       Yyt@N // remove break and fix ng: uiting/-e/-svermoë and similar compounds
+             uit (munten  %Yyt // move stress: uitmuntend/-e
              uit (sluiten %Yyt // move default stress: uitsluitend/-e
              uitsluitlik  %YytslYytl@k // move default stress: uitsluitlik/-e
              uitsonderli (k  %YytsOn@rl@ // move default stress: uitsonderlik/-e vs. uitsonder
-             uit (sorteer ''Yyt // remove stress from -eer and place on 1st slb
              uitspreekl   %Yytspre@kl // fix stress and avoid -lik suffix: onuitspreeklik/-e
              uitstaan (C  %YytstA:n // move default stress: uitstaande/onuitstaanbaar/-bare 
              uit (steken  %Yyt // move default stress
              uit (spatt   %Yyt // move default stress
              uit (voerba  %Yyt // move default stress: (on)uitvoerbaar/-bare/-baarheid
+             uit (voerig  %Yyt // move stress: uitvoerig/-e/-heid
              uit (wisba   %Yyt // move default stress: (on)uitwisbaar/-bare/-baarheid
           _) uitge (@P5   'Yytx2@ // words beginning with uitge have stress on 1st slb
              uitgewer     'Yytx2,e@v@r
@@ -3499,6 +3533,8 @@
              uitke (n     YytkE // mix e sound: uitken
              ulti (ma     %Wlt%i // move default stress: ultimatum/-s
           _) u (ra        %y // uraan and compounds/uranus
+          _) ure (C       y:r@ // fix e sound: urelange/uremeter/-s
+          _) ure (t       %yre@ // fix stress and e sound: ureter/uretra/-s
              urienweg     %yrinv&x2_ // fix stress and e sound: urienweginfeksie/-ontsteking, etc.
              urine        %yrin@ // urine and compounds
              urineer      yrin'e@r // stress to end
@@ -3527,10 +3563,13 @@
           _) vang (@      faN // vangwa, etc.; see rule: _) van (@         f%an 
              vangen       f'aN@n // gevangene/gevangenis/bevangenheid
           _) vanklik      faNkl@k // (on)ontvanklik/-e/-er/-heid
+             vanself (spr f%ans%&lf // move default stress: vanselfsprekend/-e/-heid
              vari (A      v%ar%i // fix v sound and stress: variasie/-s/varieer
              vati (kaan   f%at%i // fix stress and shorten a sound: vatikaan and derivitives and compounds
           @) ve (_        _^_EN    //words ending in ve is English
+             veel (duid   f%e@l // move default stress: veelduidig/-e/veelduidend/-e
              veel (jar    f%e@l // move default stress: veeljarig and derivitives
+             veel (s@@    f%e@l // move default stress: veel(seggend/sellig/sinnig/soortig/stemmig/sydig)
           A) ves (_       _^_EN // words ending in ves after vowel are English
 
              ve (l        f& // maagvel, stress on 1st slb
@@ -3550,12 +3589,19 @@
              vio (letK    f%i%u // move default stress: violet/-te/-kleurige, etc.
           _) vi (ri       v@ // fix stress and v and i sounds: viriel/-eviriliteit
              virtu v@rtS%y //virtueel virtuose etc. fix v and t sounds and assure lack of stress
+             v (iruK      v // fix v sound: virus/-se and many compounds
+             vitri (oel   f%itr%i // fix stress and v sound: (blou/groen/koper/sink)vitrioel
+             viëtna (me   vj%Etn%a // fix stress and v and vowel sounds: Viëtnamees/-nese
              ver (kyker f'&:r //verkyker and compounds
           _) ver (@P3     f@r
          @C) ver (_       f&:r // fix e sound in compounds ending in -ver
              verant (w    f@r%ant // (on)verantwoordelik/-heid/verantwoording
              verant (woord_ f@r_ant // fix stress: (on)verantwoord (single word) 
              verant (woorde_ f@r_ant // fix stress: (on)verantwoorde (single word)
+             vere (b      fe@r@ // ver- not prefix: verebed/-bedryf/-bedekking
+             vere (h      fe@r@ // ver- not prefix: verehoed/-e/-ens
+             vere (k      fe@r@ // ver- not prefix: verekombers/-kuif/-kussing
+             vere (m      fe@r@ // ver- not prefix: verematras/-se/-sie
              verende      f'e@r@nd@
              verer (ing   f@r_e@r // verering and compounds ending with verering, eg. heldeverering
              ver (gesig   f&r // fix stress and 1st e sound: vergesig/-te
@@ -3564,9 +3610,10 @@
              vering       f'e@r@N   //motivering preservering etc.
           @) vers (_      f&rs // teksvers/slotvers/kindervers and similar
           @) vers (e_     f&rs // plurals of words like the above
+          _) versf        f''&rsf // fix stress and e sound: versfragment/-e
              ver (sie_    f&:r //words ending in versie
              ver (sies_   f&:r //words ending in versies
-             ver (flent   f@r // verflenter and derivitives; see rule: verf (C      f&rf 
+             ver (flenC   f@r // verflenter and derivitives/verflens; see rule: verf (C      f&rf 
              ver (fris    f@r // verfris and derivitives; see rule: verf (C      f&rf 
              verfyn       f@rf'eIn
              verf (@      f&rf // verfkwas/-voorraad/-emmer and similar
@@ -3627,8 +3674,10 @@
              volles (_    fOl@s // fix stress and e sound: volles/passievolles, etc.
              vol (hou_    fOl // exception to: vo (lC       f%O
              vol (maan    fOl // exception to: vo (lC       f%O
+             vol (mane    fOl // exception to: vo (lC       f%O
              vol (prop    fOl // exception to: vo (lC       f%O
              vol (r       fOl // volrond/-rooi/-ryp: exception to: vo (lC       f%O
+             vol (sirk    fOl // volsirkel: exception to: vo (lC       f%O
              vol (ste_    fOl // exception to: vo (lC       f%O
              vol (sto     fOl // volstof/volstoom/volstop/volstort; exception to: vo (lC       f%O
              voltyds      fOlteIts // voltyds/-e: exception to: vo (lC       f%O
@@ -3640,6 +3689,7 @@
              vol (groei   f%Ol // fix stress: (on)volgroeid/-e/-es
              voren        f'o@r@n // alvorens/vorentoe
              voog (dy     f%o@x2 // fix stress: voogdy and compounds
+             voor (afgaan f%o@r_ // move default stress: voorafgaan/-de/-s
              voorbar      fo@rb'A:r // move default stress: voorbarig and derivitives
           _) voorbe (@P6  f'o@rb@
           _) voor (bee+   fo@r // voorbeeld
@@ -3657,15 +3707,19 @@
              vooruit (strew fo@rYyt' // change stress
              voorwaard (_ f%o@rvA:rd // stress: (on)voorwaardelik
              vorm         fOr@m
+             vorsti (n    fOrst'I // fix stress: vorstin/-ne/-netjie and compounds
              vrede        fre@d@ // fix e sound: tevredegestel/tevredener/vredemaker
              vreemde      fre@md@  // vreemde/s/vreemdeling
              vreesaan (ja fr%e@s?%A:n // fix stress: vreesaanjaend/-e/vreesaanjagend/-e
              vriendi (n   frind'I // vriendin/vriendinne/vriendinnetjies
              vrygewig     freIx2'e@v@x2 // vrygewig/-e|-heid
              vry (moed    fr%eI // move default stress: vrymoedig/-e/-heid
+             vry (posti   fr%eI // move default stress: vrypostig/-e/-heid
              vry (wil     fr%eI // vrywillig/-lik|-heid
              vuldig       f'Wld@x2 // sorgvuldig/veelvuldig/vermenigvuldig and variants
              vul (ka      f%Wl // move default stress: vulkaan/vulkane/vulkanies
+             vy (andig    f%eI // move default stress: vyandig/-e/-heid
+             vér          f&:r // fix e sound: ver when stressed
 
 
 
@@ -3683,6 +3737,8 @@
           k) w (And       v // fix w sound: buikwand/rukwinde
           s) w            w
        lyks) w (aaC       v // fix w sound: lykswaad/-waak
+         @s) w (ang_      v // fix w sound: meisieswang/rotswang and similar
+         @s) w (ange_     v // fix w sound: plurals of the above
           s) w (art       w // fix w sound in compounds like donderswart
          &s) w (eefs      v // fix w sound: compounds like -sweefsel/tuisweefstof, etc.
       plaas) w (erC       v // fix w sound: plaaswerf/-werwe
@@ -3691,9 +3747,12 @@
              wreed (a     vre@t_ // fix d sound and insert short pause: wreedaard/-s
              wreed (aardig vr%e@t_ // move default stress: wreedaardig/-e/-heid
          @s) w (al        v // fix w sound: dwarswal/gruiswalle/loodswalvis
+         @s) w (alk_       w // fix w sound: omswalk/rond(ge)swalk/voortswalk
           s) w (eek       v // fix w sound: feesweek/kersweek/paasweek/vandeesweek/werksweek
          @s) w (iel       v // fix w sound: fietswiel/gewaarwordingswiel and similar compounds
           s) w (il        v // fix w sound: groepswil/hemelswil/liefdeswil/korswil	
+             wilker       vIlk@r // fix e sound: (treur)wilkerboom/-tak, etc.
+             winke (lier  v@Nk@l // move default stress: winkelier/-s and compounds
           C) winkel       vINk@l // w sound: boek/dames/plaaswinkel, etc.
           C) w (it_       v // fix v sound: bleek-/grys-/kryt-/lyk-/melk-/naaswit
           s) w (yf        v // fix w sound: viswyf/ganswyfie/mannetjieswyfie
@@ -3714,10 +3773,16 @@
              weer (barst  v%e@r // move default stress: weerbarstig/-e/-heid
              weer (lê       v%e@r // move default stress
              weer (leg      w%e@r // move default stress: (on)weerlegbaar
+             weer (strew  v%e@r // move default stress: weerstrewig/-e/-heid
+          @) wees (_      ve@s // fix w sound: siekwees/volkwees
           @) weg (_       v&x2 // blindweg/botweg and many similar
       spoor) weg          v&x2 // fix e sound: spoorwegaanleg/-aansluiting/-amptenaar/-eiendom/-inkomste/-ongeluk...
+          _) wegge (C@P5  v'&x2@ // prefix: weggeja and similar
+             weife (l     veIf@ // fix e sound: weifelloos/-lose/-loosheid
              welbehaaglik v%&lb@hA:x2l@k // move default stress: welbehaaglik/-e/-er/-ste
              welf (_      v&lf // fix e sound: omwelf/oorwelf
+             wel (skape   v%&l // move default stress: welskape/-nheid
+             wel (spreken v%&l // move default stress: welsprekend/-e
           @) wendig       v'End@x2 // inwendig/noodwendig/uitwendig
           &) wene (_      v@n@ // fix penultimate e sound: afgestorwene/-s/ingeskrewene/verdorwene/verhewene
           A) wer (AA      v@r // fix e sound: beyweraar/keweruitroeiing/nyweraar/oewereienaar
@@ -3742,6 +3807,8 @@
           _) wan (A       van_ // wanorde/wanopvatting/wanaanpassing/winindruk
           C) wag          vax2 // fix w sound: bokwagter/skildwag and compounds/veldwagter
           k) wagga        wax2a // fix w sound: kwagga/bergkwagga, etc.
+             wankel (moed v%aNk@l // move default stress: wankelmoedig/-e/-heid
+             wan (stalt   v%an // move default stress: wanstaltig/-e/-heid
              wan (trouig  v%an // move default stress: wantrouig/-e
              wapen        vA:p@n // fix problems with compounds and derivitives of wapen: ontwapening/wapengeweld
 //wapenopleiding
@@ -3768,6 +3835,7 @@
              waardeer     vard'e@r // waardeer/waardeerder
              waarder (@   vard'e@r  // waarderend/e/waardering
           &) waardig      v'A:rd@x2 // stress on -waardig: merkwaardig/besienswaardigheid, etc.
+             waar (neemba v%A:r // move default stress: waarneembaar/-bare
           C) waarts       vA:rts // fix w sound: dakwaarts/huiswaarts/kerkwaarts/noordwaarts/weswaarts
           s) wed (C       vEt       // toetswedstryd/tenniswedstryd/afloswedloop
           @) wed (str     vEt // fix e sound: buite/foto/rugbywedstryd
@@ -3781,7 +3849,10 @@
              werp         v&rp
           @) wesigheid    v'e@s@x2eIt // aanwesigheid/afwesigheid
              weten (C     ve@t@n // wetenskap/-lik/-e and compounds/compounds of geweten-
-             wêrel (d     v&:r@l
+             wêrel (djie  v&:r@l // fix -djie in wêreldjie and compounds
+             wêrelde (_   v&:r@ld@ // wêrelde and words ending in wêrelde
+             wêreld (@    v&:r@lt_ // d sound and short break: wêreldoorlog/-reis and similar
+             wêreldw      v&:r@ltv // fix t and w sounds: wêreldwater/-wys and similar
              wh           _^_EN // words containing wh are English
          @t) w (ie        v // fix w sound: (ge)kortwiek/meetwiel
           _) wig          vIx2 // fix stress: gewig/-tig/-e
@@ -3790,6 +3861,7 @@
              wispel (tu   v@sp@l // move default stress: wispelturig/-e/-heid
 
              wn           _^_EN // names containing town/Brackendowns/Brown
+          _) wol (A       vOl_ // fix o sound, insert short break: wol(onderbaadjie/-broek/-hemp/-klere)/-olie
              worth        _^_EN
              wood         _^_EN
          @C) w (ooC       v // fix w sound: eenmanswoonstel/handelswoorde/openingswoord/privaatwoonstel
@@ -3808,6 +3880,7 @@
          @C) w (yd        v // fix w sound: kerkwyding/landswyd/reikwydte/republiekwyd/wêreldwyd
          @t) wyfel        weIf@l // fix w sound: gewetenstwyfel and similar
              w (ys   v //padwyser and many others with wyser in compounds
+             wysge (rig   v%eIsx2e@ // fix stress and e sound: wysgerig/-e
           nt) w (A v
 
 .group x
@@ -3821,6 +3894,7 @@
              z            z
              z (z
           t) z            s // fix s sound: britz/fritz/hertz and similar
+             zebra        ze@bra // fix vowel sounds: zebra/-strepe
 
 .group 
           @) 'tjie        %ici // foto'tjie/ma'tjie, etc.
@@ -3883,3 +3957,21 @@
              . (.        _:
         \.)  .
 
+// extra symbols
+            ¥        jEn
+            §        afde@l@N
+            ¶        parax2rA:f
+            ¶¶       parax2rA:v@
+            ¤        mWnte@k@n
+            ©        kup'ir&x2
+            °        x2rA:d@
+            −        minWs
+            ±        plWs_OfminWs
+            µ        mikru
+            ¼        @kwart
+            ½        @halv@
+            ¾        drikwart
+            ×        mA:l
+            ÷        x2@de@ldY@r
+            ♯        krYys
+            ♭        mOl
diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index ab20dae4..b605f7a3 100644
--- a/dictsource/dict_phonemes
+++ b/dictsource/dict_phonemes
@@ -11,8 +11,8 @@ Yy
 
 -    :    ;    ?    b    c    d    dZ   
 f    g    h    j    k    l    m    n    
-N    p    r    r-   s    S    t    tS   
-v    w    x2   z    Z    
+N    p    r    s    S    t    tS   v    
+w    x2   z    Z    
 
 
 Dictionary cs_dict
@@ -94,7 +94,7 @@ o    O    oI   u
 *    **   :    b    B    d    D    f    
 g    j    J    J^   k    l    l^   m    
 n    n^   p    Q    r    R    s    t    
-T    tS   v    w    x    
+T    tS   v    v#   w    x    z    
 
 
 Dictionary fi_dict
@@ -337,8 +337,8 @@ x    z    Z
 Dictionary zh_dict
 
 @    @r   a    A    ai   Au   E    ei   
-i    i.   i[   iou  o    o-   ou   u    
-uai  y    
+i    i.   i[   iou  N-   o    o-   ou   
+u    uai  y    
 
 (u)  :    f    h    j    k    kh   l    
 m    n    N    p    ph   r    s    s.   
@@ -399,4 +399,5 @@ u#   W    y    Y
 
 :    ;    b    d    dZ   f    g    h    
 j    k    l    m    n    p    Q    r    
-R    s    S    t    tS   v    z    Z    
+R    s    S    t    tS   v    w    z    
+Z    
diff --git a/dictsource/es_rules b/dictsource/es_rules
index dca313bf..3e13b30f 100644
--- a/dictsource/es_rules
+++ b/dictsource/es_rules
@@ -160,9 +160,11 @@
 .group v
        _) v (_       uBe
           v          B
-       _) v          b
-       m) v          b
-       n) v          b
+       _) v          v#
+?1     m) v          b
+?1     n) v          b
+?2        v          v#
+?2     _) v          v
 
 
 .group w
@@ -173,8 +175,9 @@
 .group x
        _) x (_       Ekis
           x          ks
-//       A) x (A       Qs  // ??
+?1     A) x (A       Qs
           x (_       =Qs
+       _) x          z      // ?
 
 
 .group y
@@ -182,7 +185,7 @@
           y          i
        _) y          J
       _m) y          J
-      _n) y          J
+       n) y          J
       _l) y          J
           y (A       J^
 
diff --git a/dictsource/fr_list b/dictsource/fr_list
index ea3aa859..54ed2493 100755
--- a/dictsource/fr_list
+++ b/dictsource/fr_list
@@ -5,7 +5,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated 2008-02-10 Michel Such  <michel.such@free.fr>
+// Updated 2008-02-11 Michel Such  <michel.such@free.fr>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
@@ -432,10 +432,12 @@ casus    kazys
 choeur        k@r
 cocus     coky
 discident     disidA~
+estomac     Estoma
 eye	      aj
 eyes	      ajz
 fils	      fis
 imprudent     E~pRydA~
+iris	      iris
 juin	      ZyE~
 malus      malys
 many     mEni
@@ -542,20 +544,22 @@ acer             asEr
 amazon		amaz'On
 (audible manager) od'ibl||manadZ'@r
 be		bi
+being		biiN
 by		baj
 bluetooth 		blut'us
-boy		bOj
 byte		bajt
 bytes		bajts
 (cyber link) 		sibEr||link
 debian		dEbjAn
 driver		drajv@rz2
 download	dOnlod
+edit		edit
 emacs		Emaks
 emacspeak	Emakspi:k
 espeak		@spi:k
 ethernet	etERnEt
 exit	egzit
+(file zilla)		fajl@-||zija
 firefox		faj@RfOks
 (fire wire)		faj@R||wajr
 firewire		faj@Rwajr
@@ -564,7 +568,8 @@ girl		g@Rl
 gnome		gnom
 gnu		gnu
 hamburger		_!A~b@rg@r
-his		iz $u
+has		_!az $u
+his		_!iz $u
 inside		insajd
 insight		insajt
 internet	E~tERnEt
@@ -584,16 +589,18 @@ media     		medja
 messenger 		mesEnZ'@r
 movy      		mu:v'i
 my		maj
-new		nj'u
-news		nj'uz
+name		nejm
 not		nOt
 ok         oke
 open            Op'@n
 outlook         autluk
+outside		autsajd
+outsider		autsajd@r
 player    		plEj'@r
-reader          Ri:d@R
+quick    		kwik
 redhat		REdat
 release	rili:z
+same		sejm
 schubert	SubER
 screamer		skri:m@r
 (search & destroy) s@:rS_||end_||dEsstrOj
@@ -602,18 +609,22 @@ spybot		spajbOt
 sun		s@n
 sunlight	s@nlajt
 (text aloud) tEkst||@lawd
+than	Dan
 the	D@ $u
 them	DEm $u
+then	DEn $u
 there	DEr $u
 they	DE $u
-then	DEn $u
 thunderbird	f@ndERb@Rd
 time	tajm
 timer	tajm@r
 ubuntu		ubuntu
 update		@pd'E:jt
 upload	@plod
+very	vEri
 viavoice	viavOjs
+was		waz $u
+window		windo
 windows		windoz
 word		wWRd
 writer		rajt@r
diff --git a/dictsource/fr_rules b/dictsource/fr_rules
index e1f5a942..d38cf9ca 100755
--- a/dictsource/fr_rules
+++ b/dictsource/fr_rules
@@ -3,7 +3,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated: 2008-02-10 Michel Such  <michel.such@free.fr>
+// Updated: 2008-02-11 Michel Such  <michel.such@free.fr>
 //
 //	* The rules are based on Cicero TTS.
 //
@@ -38,6 +38,7 @@
 		a  (nnA     a		// manne
 		an (C       A~		// ancien
 		an (_       A~		// élan
+	_C)	aon  (_        A~		// faon, paon, taon
 	s)	aoul  (_        u		// saoul
 		aoû         ut		// août
 		au (l_      O		// Paul
@@ -127,8 +128,10 @@
 .group e
 		e (Ce_      E
 		eau         o		// bateau cheveaux
+	C)	ea (d		i:      		// read
 	Cr)	ea (m		i:      		// stream
 	Cl)	ea (n		i:      		// clean
+	C)	ea (Cer		i:      		// reader, cleaner
 	j)	e (a        		// Jean Jeanne
 	sp)	ea (k  	i:      		// speak speaker
 	p)	ect (_      E		// suspect
@@ -138,9 +141,12 @@
 		ee          i:		// meeting
 	_cl)	ef (_       e		// clef
 	Ck)	e (r_       @		// worker, talker
+	_Cett)	e (r_       @		// letter, better
 	eaC)	e (r_       @		// speaker, streamer
-	ght)	e (r_       @		// writer, fighter
+	gh)	e (r_       @		// higher
+	ght)	e (r_       @		// fighter, lighter
 	ooC)	e (r_       @		// scooter
+	_ov)	e (r       @		// over
 		ein (C      E~		// peindre
 		ein (_      E~
 		e (il       E		// vieille
@@ -295,6 +301,12 @@
 	_)	eû          y		// eût
 		eû          Y		// jeûne
 
+		ew (_       ju		// new
+		ews        juz		// news, newsreader
+	r)	ew (_       u		// crew
+	r)	ews        uz
+	i)	ew (_       u		// view
+	i)	ews        uz
 		e (x        E		// exact
 		ey (_       e		// dahomey
 		ey (C       e		// ceylan
@@ -499,8 +511,9 @@ _)		h	(umo			// humour
 		i (es_      i		// parties
 		i (e_       i
 		i (A        j		// fermier portier patio renier
-		ig (ht        aj		// right, fight, light
+		ig (h        aj		// right, fight, light
 	wh)	ile         ajll		// while, endwhile
+	wr)	i (tA      aj		// write
 	_)	ill         ill		// illégal
 	_m)	ill         il		// mille
 	v)	ill         il		// village
@@ -517,7 +530,9 @@ _)		h	(umo			// humour
 		ing (_      iN		// parking
 		in (h       in		// inhumain
 		inct (_     E~		// distinct
-		ink (_     ink		// link, pink
+		ind (_     ajnd		// find, mind
+		ind (ing_     ajnd		// find, mind
+		ink      ink		// link, pink
 		in (n       i		// innombrable
 		in (C       E~		// vingt
 		    //		in (_       E~		// vin
@@ -581,7 +596,7 @@ _)		h	(umo			// humour
 		o (che_       O		// poche, cloche
 		oe (ll      wa		// moelleux
 	_)	oe (C       Y		// oesophage
-	_ph)	oe (t       Y		// phoetus
+	_ph)	oe (C       e		// phoetus
 		oeu       @		// soeur coeur
 		oeufs       @		// oeufs boeufs
 		o (eC       o		// coefficient
@@ -624,6 +639,7 @@ p)		oing (_      wE~		// poing
 	C)	oot        ut		// bootable football
 	z) 	oo          o		// zoo
 	z)	oo (l       oo		// zoologue
+	z)	oo (ph       oo		// zoophile
 	z)	oo (m       u		// zoom
 		oo (X       u		// pool
 	_gal)	op (_       o		// galop
@@ -644,6 +660,8 @@ p)		oing (_      wE~		// poing
 		oû          u		// coûter
 		oyes (_     wa		// troyes
 		oy (A       waj		// noyer voyelles
+		oy (_       Oj		// boy, toy
+		oys (_       Ojz		// boys, toys
 		oy          wa		// roy
 		o (_        o		// zorro allégro
 		o (z_       o		// berlioz
@@ -752,9 +770,11 @@ e)		s (_h      z2
 	mu) 	s (_        s
 	_mu) 	s (_
 	ému) 	s (_
+	unu) 	s (_        s // prunus
 	opu) 	s (_        s // opus, octopus
 	Aru) 	s (_        s // virus
 	aru) 	s (_         // disparus
+	ouru) 	s (_         // courus
 	psu) 	s (_        s // lapsus
 
 	atu) 	s (_        s		// stratus cactus motus
@@ -764,6 +784,7 @@ e)		s (_h      z2
 	itu) 	s (_        s
 	ltu) 	s (_        s     // altus
 	otu) 	s (_        s     // motus
+	Cutu) 	s (_        s
 
 	_tou)	s (_C
 	_tou) 	s (_        s
@@ -792,6 +813,7 @@ C)		te (_      t@-  		// patte
 
 	s) 	th (m 		// asthme
 		th          t	// théorie
+	sCar)	t (_        t	// smart, start
 	hui)	t (_        t	// huit
 
 	_)	t           t   // tien tiers
@@ -870,6 +892,7 @@ C)		te (_      t@-  		// patte
 		w           w
 		wa (Ce_ 	    wE // hardware software wave
 		w (agon 	    v // wagon
+		w (r 	      // write
 
 
 .group x
@@ -905,6 +928,7 @@ C)		te (_      t@-  		// patte
 
 		ym (b       E~	// symbolique
 		ym (p       E~	// tympan
+		ym (_       E~	// thym
 		y (nn       i
 		y (nA       i
 		ys (_       is
diff --git a/dictsource/tr_rules b/dictsource/tr_rules
index fbe09344..9bd26d4a 100644
--- a/dictsource/tr_rules
+++ b/dictsource/tr_rules
@@ -52,9 +52,9 @@
 .group m
         m        m
 
-     @) ma (_S2  m%a
-     @) me (_S2  m%e
-     @) mı (_S2  m%u#
+        ma (_S2  m%a
+        me (_S2  m%e
+        mı (_S2  m%u#
 
 .group n
         n        n
@@ -93,10 +93,11 @@
         v        v
 
 .group w
-        w        v
+        w        w
 
 .group x
         x        ks
+     K) x        z
 
 .group y
         y        j
diff --git a/dictsource/zh_rules b/dictsource/zh_rules
index 9a05e9ac..39cbdb06 100644
--- a/dictsource/zh_rules
+++ b/dictsource/zh_rules
@@ -129,7 +129,8 @@ language).
        ia (DngK	iA
        iao	jAu
        ie	iE
-       io (DngK 	y
+       io (DngK	y
+    q) io (DngK	u 
        iu 	iou 
 
 .group j
@@ -147,6 +148,7 @@ language).
 .group n
        n        n
        ng (K	N     // consider (ng+vowel) as (n g+vowel) ??
+    _) ng (K	N-    // syllablic [N]
 
 .group o
        o        o
@@ -170,6 +172,7 @@ language).
 
 .group r
        r        z.
+       r (K     @r11
 
 .group s
        s        s
@@ -180,8 +183,10 @@ language).
 
 .group u
        u        u
-       ua	wA  //ua uan uang, and uan should be more different from uang
+       ua	wA
        ua (DnK	ua
+    g) ua (DnK	wa
+    k) ua (DnK	wa
        ua (DngK wA
        uai	uai
        ua1i	uai55
@@ -190,17 +195,24 @@ language).
        ua4i	uai51
        ue	yE //üe
        ui	uei
+   sh) ui	wei
        u (DnK	u@
     k) u (DnK   wu@
    _h) u (DnK	wu@
     t) u (DnK   wu@
        uo	uo
 
+   sh) ui	wei
+   sh) u (DnK	wo-
+   sh) uo	wo
+
   L01) u	y   /// j,q,x,y + u
   L01) u (DnK	y@
+    q) u (DnK+  yi
   L01) ua (DnK	y&
   L01) ue	yE
 
+
 .group ü
        ü	y
        üe	yE
@@ -234,7 +246,8 @@ language).
 .group y
        y	j //before a o e i
        y (u	//NULL before u
-       y (uDn   j
+       y (uK	;
+       y (uDn   ;
        yo (DngK	yu
        y (K     i    // foreign words
 
diff --git a/espeak-data/voices/es b/espeak-data/voices/es
index 65e978fa..1a9e53b6 100755
--- a/espeak-data/voices/es
+++ b/espeak-data/voices/es
@@ -2,5 +2,6 @@ name spanish
 language es
 gender male
 
+dictrules 1
 intonation 3
 
diff --git a/espeak-data/voices/es_la b/espeak-data/voices/es_la
new file mode 100755
index 00000000..230e099f
--- /dev/null
+++ b/espeak-data/voices/es_la
@@ -0,0 +1,11 @@
+name spanish-latin-american
+language es-la
+gender male
+
+phonemes es_la
+dictrules 2
+intonation 2
+stressLength 170 200  180 180  0 0  250 280
+
+replace 00 T s
+
diff --git a/phsource/compile_report b/phsource/compile_report
index 6bc8bad6..85c797e3 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -1,4 +1,4 @@
-47 phoneme tables
+48 phoneme tables
           new total
     base  99   99
    base2  24  118
@@ -30,7 +30,8 @@
       ru  38  129
       it  17  121
       la  21  117
-      es   7  118
+      es   8  119
+   es_la   1  119
       pt  27  134
    pt_pt  20  134
       ro  36  142
@@ -41,7 +42,7 @@
       is  32  124
       vi  42  137
      zhy  40  132
-      zh  63  147
+      zh  65  149
       sw  14  108
       th  50  142
       id  14  120
@@ -429,6 +430,7 @@ nn/nn_          [N] base
 nn/nn@          [(@)] base
 nn/nn#_         [N#] is
 nn/nn2_         [N] zh
+                [N-] zh
 nn/nna          [(a)] base
 nn/nne          [(e)] base
 nn/nni          [(i)] base
@@ -485,7 +487,6 @@ r3/r_trill.wav  [R2] base
                 [x] pt
 r3/r_u          [(u)] base
 r3/rx           [*] base
-                [**] base
                 [r/] base
                 [r/] af
                 [r/] fr
@@ -497,7 +498,6 @@ r3/rx           [*] base
 r3/rz_cs        [R^] sk
                 [R^/] sk
 r3/@tap         [**] base
-r3/@tap_i       [**] base
 r/r             [r] base
                 [r-] base
                 [r] en_sc
@@ -649,7 +649,6 @@ ustop/ki        [c] base
                 [c] af
                 [k] fi
                 [k] fr
-                [k] hi
                 [k] hu
                 [k] sk
                 [k^] mk
@@ -661,7 +660,6 @@ ustop/kl        [k] base
                 [k] en
                 [k] fi
                 [k] fr
-                [k] hi
                 [kh] hi
                 [k] hu
                 [k] sk
@@ -673,7 +671,6 @@ ustop/kr        [k] base
                 [k] en
                 [k] fi
                 [k] fr
-                [k] hi
                 [kh] hi
                 [k] hu
                 [k] sk
@@ -812,13 +809,13 @@ ustop/ts_pzd2   [c] hi
                 [c] hu
 ustop/t_sr      [d] sr
                 [t] sr
-                [t] zh
 ustop/ts_rfx    [ts.] zh
 ustop/ts_rfx_unasp  [ts.] zh
 ustop/ts_sr     [tS;] sr
                 [dZ;] sr
 ustop/ts_unasp  [ts] zh
 ustop/t_unasp   [t] th
+ustop/t_unasp2  [t] zh
 vdiph/0i        [OI] pt
                 [OI] grc
                 [OI] vi
@@ -1041,6 +1038,7 @@ vdiph/&y        [&y] fi
 vdiph/yi        [yi] fi
                 [yI] grc
                 [u-I] no
+                [yi] zh
 vdiph/y#i       [Yi] fi
 vdiph/y#i_2     [Yy] is
 vdiph/yi_fr     [w^i] fr
@@ -1073,8 +1071,10 @@ vnasal/o_n2     [o~] af
 vnasal/oo_n     [O~] en
 vnasal/oo_n2    [O~] hi
                 [O~] pl
+                [o] zh
 vnasal/u_n      [u~] hi
                 [u~] pt
+                [u] zh
 vnasal/W_n      [W~] en
                 [E~] fr
                 [W~] fr
@@ -1107,8 +1107,10 @@ voc/v_          [B] base
                 [v] hi
                 [v] ta
                 [v2] nl
+                [v#] es
                 [v;] ro
                 [v] is
+voc/v2          [v#] es
 voc/vj          [v] base
                 [v] fr
 vocw/dh         [D] base
@@ -1123,6 +1125,7 @@ vocw/v          [B] base
                 [v] base
                 [v] fr
                 [v] ta
+                [v#] es
                 [v;] ro
 vocw/zh         [Z] base
                 [Z;] ro
@@ -1166,8 +1169,7 @@ vowel/&         [a] en_rp
                 [&] fi
                 [&:] hi
                 [&] sv
-vowel/0         [O] base2
-                [0] en
+vowel/0         [0] en
                 [O] hi
                 [O] pt
                 [O] grc
@@ -1532,7 +1534,6 @@ vowel/oe_2      [W] no
 vowel/oe_4      [W] sv
 vowel/o_mid     [O] fr
                 [o] hu
-                [o] zh
                 [o] tr
 vowel/oo        [O:] en_sc
                 [O] en_wi
@@ -1566,7 +1567,8 @@ vowel/oo_2      [0] en_sc
                 [O] cy
                 [o] cs
 vowel/oo_3      [O] af
-vowel/oo_4      [0] en_wm
+vowel/oo_4      [O] base2
+                [0] en_wm
                 [V] en_wi
                 [3:] en_wi
                 [O:] hi
diff --git a/phsource/ph_base2 b/phsource/ph_base2
index 4fbb2922..2e77f092 100644
--- a/phsource/ph_base2
+++ b/phsource/ph_base2
@@ -1,6 +1,6 @@
 
 //====================================================
-//  Italian
+// 
 //====================================================
 
 
@@ -31,7 +31,6 @@ phoneme E
   vowel starttype (e) endtype (e)
   length 170
   formants vowel/ee_1
-  reduceto  e  4        // [E] only in stressed syllables
 endphoneme
 
 
@@ -53,8 +52,7 @@ endphoneme
 phoneme O
   vowel starttype (o) endtype (o)
   length 170
-  formants vowel/0
-  reduceto  o  4        // [O] only in stressed syllables
+  formants vowel/oo_4
 endphoneme
 
 
diff --git a/phsource/ph_hindi b/phsource/ph_hindi
index f2461b23..8e87ab51 100644
--- a/phsource/ph_hindi
+++ b/phsource/ph_hindi
@@ -508,9 +508,6 @@ phoneme k
   lengthmod 2
   wave ustop/k_unasp%60   // weaker
   before _ ustop/k_unasp%50
-  before r ustop/kr
-  before l ustop/kl
-  before (i) ustop/ki
   switchvoicing g
 endphoneme
 
diff --git a/phsource/ph_spanish b/phsource/ph_spanish
index ad97b82d..d435687f 100644
--- a/phsource/ph_spanish
+++ b/phsource/ph_spanish
@@ -1,6 +1,6 @@
 
 //====================================================
-//  Spanish  - based on Italian
+//  Spanish  - based on Base2
 //====================================================
 
 phoneme E
@@ -66,6 +66,17 @@ phoneme r    //   TEST flap ??
 endphoneme
 
 
+phoneme v#   // a shorter [v], a little towards [b]
+  vcd lbd frc
+  vowelin  f1=1  f2=1000 -300 -200  f3=-300 100
+  vowelout f1=0  f2=1000 -500 -300  f3=-300 60  len=10
+  lengthmod 6
+  formants voc/v2+vocw/v%75
+  before _ voc/v_+vocw/v%75
+  switchvoicing f
+endphoneme
+
+
 
 
 
diff --git a/phsource/ph_zh b/phsource/ph_zh
index 9edba062..e9e32926 100644
--- a/phsource/ph_zh
+++ b/phsource/ph_zh
@@ -89,12 +89,13 @@ endphoneme
 
 phoneme t
   vls alv stop
-  vowelin f1=0  f2=1700 -300 300  f3=-100 80
+  vowelin f1=0  f2=1700 -300 300  f3=-100 80  rms=40
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_sr%10
+  wave ustop/t_unasp2%40
 endphoneme
 
+
 phoneme th
   vls alv stop
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
@@ -231,6 +232,13 @@ phoneme N //should be more different from n
 //  after (i) nn/inn
 endphoneme
 
+phoneme N-   // syllabic N
+  vowel starttype N endtype N
+  length 250
+  formants nn/nn2_
+endphoneme
+
+
 phoneme a
   vowel starttype (a) endtype (a)
   length 250
@@ -337,7 +345,7 @@ phoneme o
   vowel starttype (o) endtype (o)
   length 250
   formants vdiph2/o_oo
-  before N vowel/o_mid
+  before N vnasal/oo_n2
 endphoneme
 
 phoneme o-
@@ -356,6 +364,7 @@ phoneme u //try more before N
   vowel starttype (u) endtype (u)
   length 250
   formants vowel/u_bck
+  before N vnasal/u_n
 endphoneme
 
 phoneme uA
@@ -423,4 +432,10 @@ phoneme y@
   vowel  starttype (i)  endtype (@)
   length 250
   formants vdiph2/y@
+endphoneme
+
+phoneme yi
+  vowel  starttype (i)  endtype (i)
+  length 250
+  formants vdiph/yi
 endphoneme
\ No newline at end of file
diff --git a/phsource/phonemes b/phsource/phonemes
index 0555f27b..c06a3d43 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -605,9 +605,9 @@ phoneme **    //   TEST flap
   vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
   vowelin f1=2  f2=1600 -300 300  f3=-100 80 len=20
   formants r3/@tap
-  vowelin f1=3  f2=1600 -300 300  f3=-300 80
-  before (i) r3/@tap_i+r3/rx
-  before (e) r3/@tap_i+r3/rx
+//  vowelin f1=3  f2=1600 -300 300  f3=-300 80
+//  before (i) r3/@tap_i+r3/rx
+//  before (e) r3/@tap_i+r3/rx
 endphoneme
 
 
@@ -855,8 +855,8 @@ endphoneme
 
 phoneme J^   // palatal fricative (Kirshenbaum C<vcd>)
   vcd pal frc palatal
-  vowelin f1=2  f2=2700 400 600  f3=200 70
-  vowelout f1=2 f2=2700 400 600  f3=200 70 len=100
+  vowelin f1=1  f2=2700 400 600  f3=200 70
+  vowelout f1=1 f2=2700 400 600  f3=200 70 len=100
   lengthmod 6
   formants voc/j+ufric/ch%25
 endphoneme
@@ -1233,6 +1233,9 @@ include ph_latin
 phonemetable es base2
 include ph_spanish
 
+phonemetable es_la es
+include ph_spanish_la
+
 phonemetable pt base2
 include ph_pt_brazil
 
diff --git a/phsource/ustop/t_unasp2.wav b/phsource/ustop/t_unasp2.wav
new file mode 100644
index 00000000..1b4d4682
Binary files /dev/null and b/phsource/ustop/t_unasp2.wav differ
diff --git a/phsource/vdiph/yi b/phsource/vdiph/yi
index e3abc3e1..a10d5793 100644
Binary files a/phsource/vdiph/yi and b/phsource/vdiph/yi differ
diff --git a/phsource/vnasal/vowelchart.png b/phsource/vnasal/vowelchart.png
index 6a197de0..a951d563 100644
Binary files a/phsource/vnasal/vowelchart.png and b/phsource/vnasal/vowelchart.png differ
diff --git a/phsource/voc/j b/phsource/voc/j
index fb7ed39c..68792985 100644
Binary files a/phsource/voc/j and b/phsource/voc/j differ
diff --git a/phsource/voc/v2 b/phsource/voc/v2
new file mode 100644
index 00000000..37b386fc
Binary files /dev/null and b/phsource/voc/v2 differ
diff --git a/phsource/vowel/i#_7 b/phsource/vowel/i#_7
index 9b58f779..e80b51d5 100644
Binary files a/phsource/vowel/i#_7 and b/phsource/vowel/i#_7 differ
diff --git a/src/intonation.cpp b/src/intonation.cpp
index c8525b9b..e684bd3d 100755
--- a/src/intonation.cpp
+++ b/src/intonation.cpp
@@ -779,7 +779,7 @@ void Translator::CalcPitches_Tone(int clause_tone)
 			prev_tph = phoneme_tab[phonPAUSE];  // forget across word boundaries
 		}
 
-		if(p->type == phVOWEL)
+		if(p->synthflags & SFLAG_SYLLABLE)
 		{
 			tone_ph = p->tone_ph;
 			tph = phoneme_tab[tone_ph];
@@ -855,7 +855,7 @@ void Translator::CalcPitches_Tone(int clause_tone)
 	p = &phoneme_list[0];
 	for(ix=0; ix<n_phoneme_list; ix++, p++)
 	{
-		if(p->type == phVOWEL)
+		if(p->synthflags & SFLAG_SYLLABLE)
 		{
 			tone_ph = p->tone_ph;
 
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 183ef505..6ccb523d 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.31.09  11.Feb.08";
+const char *version_string = "1.31.10  12.Feb.08";
 const int version_phdata  = 0x013105;
 
 int option_device_number = -1;
diff --git a/src/tr_languages.cpp b/src/tr_languages.cpp
index f6d264b8..954e6474 100644
--- a/src/tr_languages.cpp
+++ b/src/tr_languages.cpp
@@ -225,7 +225,7 @@ Translator *SelectTranslator(const char *name)
 	case L('e','s'):   // Spanish
 		{
 			static const short stress_lengths_es[8] = {170, 200,  180, 180,  0, 0,  220, 250};
-			static const unsigned char stress_amps_es[8] = {16,12, 18,18, 20,22, 22,22 };    // 'diminished' is used to mark a quieter, final unstressed syllable
+			static const unsigned char stress_amps_es[8] = {16,12, 18,18, 20,20, 20,20 };    // 'diminished' is used to mark a quieter, final unstressed syllable
 
 			tr = new Translator();
 			SetupTranslator(tr,stress_lengths_es,stress_amps_es);
diff --git a/src/translate.cpp b/src/translate.cpp
index 578c6719..c6f366db 100755
--- a/src/translate.cpp
+++ b/src/translate.cpp
@@ -1491,8 +1491,9 @@ int Translator::TranslateWord2(char *word, WORD_TAB *wtab, int pre_pause, int ne
 		if(ph_code == phonSYLLABIC)
 		{
 			// mark the previous phoneme as a syllabic consonant
-			ph_list2[n_ph_list2-1].synthflags |= SFLAG_SYLLABLE;
-			ph_list2[n_ph_list2-1].stress = next_stress;
+			prev_vowel = n_ph_list2-1;
+			ph_list2[prev_vowel].synthflags |= SFLAG_SYLLABLE;
+			ph_list2[prev_vowel].stress = next_stress;
 		}
 		else
 		if(ph_code == phonLENGTHEN)