diff --git a/dictsource/af_list b/dictsource/af_list
index 79fa4f18..c6f66b24 100755
--- a/dictsource/af_list
+++ b/dictsource/af_list
@@ -53,8 +53,8 @@ _4	'fir
 _5	'feIf
 _6	'sEs
 _7	'se@v@
-_8	_'axt
-_9	'ne@x@
+_8	_'ax2t
+_9	'ne@x2@
 _10     'tin
 _11     _'&lf
 _12     'tw'A:lf
@@ -97,7 +97,6 @@ mosambiek   musamb'ik
 thaba       tA:ba
 (thaba nchu) tab'A:||ntSu
 europa      Y@r'o@pa
-paarl       p&:r@L
 portugal    $1
 pretoria    prit'o@ria
 stellenbosch st%&l@mbOs 
@@ -111,6 +110,7 @@ André       'andreI
 annette     an'Et
 aucamp      @Ukamp
 benjamin    bEndZ@m@n
+bester b'Est@r
 botha       bo@ta
 bothma      bOtma
 breytenbach breIt@nbax2
@@ -126,6 +126,7 @@ der         d@r
 deventer d'e@v@nt@r
 elize       il'i:z
 esegiël    is'e@x2i_@l
+estelle     %ist&l
 eugene      judZ'i:n
 eugène     yZ'En
 ferreira    f@r&:r@
@@ -138,8 +139,9 @@ grange      x2rA:nsi
 gustav      gustaf
 jacobus     jako@bWs
 jacques     ZA:k
+jean        ZA~n
 jesus       ji:sWs
-joey        dZ@ui
+joey        dZ@Ui
 john        _^_EN
 le l@
 leandra     li'andra
@@ -150,6 +152,7 @@ louis       luI
 louise      luw'i:z
 louw l'@U
 maria mar'ia
+martin m'A:rt@n
 michiel $2
 natasha n%at'aSa
 paul        p@Ul
@@ -555,6 +558,7 @@ vergete       f@rx2e@t@
 vergewe       f@rx2e@v@
 vermy         $2
 verre         f&:r@
+verregaande f&r@x2'A:nd@
 verreweg      f&r@v&x2
 verse         f&:rs@
 vers          f&:rs
diff --git a/dictsource/af_rules b/dictsource/af_rules
index 8ec283e4..a274c405 100755
--- a/dictsource/af_rules
+++ b/dictsource/af_rules
@@ -79,6 +79,7 @@
              aanwen (_    'A:nvEn // to correct pronunciation of e in aanwen/aanwending
           _) af (@P2      'af // afbreek/afdwaal/afdwing
           C) afel (@      A:f@l // compounds starting with tafel/ontrafeling/uitrafeling
+          _) a (ffA       %a // move default stress: affêre and compounds/affekteer
              afgee (+     'afx2e@ // see rule: _) afge (@P4    afx2@
           _) afge (@P4    'afx2@ // stress on 1st slb
              afrik (aan   %afr%ik // exception to af prefix and move stress to end
@@ -105,6 +106,7 @@
              agent        ax2'Ent
              algemeen     'alx2@m,e@n
              alleen       %ale@n // to handel stress in compounds with alleen
+             alleni (g    %ale@n@ // fix stress and e sound: allenig and derivitives, eg. allenigheid
              amandel      am'and@l    // amandel/s/-poeding/-tert...
           _) am (A        %am // amorfe/amok/amortisasie/amalgamasie
              amer (ik     %ame@r // Amerika/Amerikaner
@@ -140,6 +142,7 @@
 .group an
              an (djie+    aIN
              ange (lier   %aN@ // angelier/-e and compounds
+             an (gina     %aN // move default stress, fix n/g sounds: angina
              angl (A      %A~Nx2l% // anglikaans/anglisisme/anglofiel
              angola A~Nx2'o@la //Angola, Angolabos etc.
              angol (e %A~Nx2%ul //Angolese etc.
@@ -163,7 +166,9 @@
           _) be (@P2      b@
           @) be (C        b@
           C) be (rsie     b'&: //kombersie etc.
-          @) ba (rend     b'A: // onrusbarend/opsienbarend and derivitives
+             band (A      bant // fix t sound: bandomslag/-ontwerp/-opname
+             band (e      band // fix d sound: bandeverkoper moterbande etc.
+          @) ba (ren      b'A: // onrusbarend/opsienbarend and derivitives
              ba (ret      b%a // move default stress and shorten a sound: baret/-te
              ba (riton    ba // shorten a sound: bariton and compounds
              basi (s      bA:s@ // basis and compounds
@@ -218,7 +223,7 @@
              ba (lkon     b%a // move default stress: balkon and compounds
              ballade      b%alA:d@ // move default stress: ballade and compounds
              baller (inA  b%al@r // move default stress: ballerina/-o and compounds
-             ba (llet     b%a // move default stress: ballet and compounds
+             balle (t     b%alE // move default stress: ballet and compounds
              ba (lletjie  ba // restore default stress: balletjie/-s
              ba (llon     b%a // move default stress: ballon and compounds
              ballo (t     b,alO // move default stress: ballotasie/balloteer
@@ -311,6 +316,7 @@
              deur (weeC   d%y@r // move default stress: deurweef/deurweek/-te
              diaken       d%iA:k@n // diaken and compounds
              dia (m       d%i%a // diamant and compounds
+             di (GK       dI // force default stress: GEDIG/-TE/digbundel/digvorm, etc.
              dilemma      d@lEma // dilemma and compounds
           &) ding (_S4    dIN
              direk        d%irEk // direk/-sie/-te/-theid/indirek...
@@ -515,6 +521,7 @@
           &) ers (_       @rs
           &) erei (_      @reI
              e (r         &
+        Ank) e (r@        @ // ankerpaal/kankerlyer/donkerbril
 
         lew) e (ns @
          &d) e (r@        @      // not initial or final syllable
@@ -604,7 +611,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           @ks) e (ms        @ // bliksems and compounds
           @) e (spel_     @ //gebarespel/kleurespel/klokkespel/parespel/poppespel/samespel/snarespel
          ar) e (sse_      'E // bibliotekaresse/sekretaresse
-          _s) e (na @ //senator and friends
+          Ks) e (na @ //senator and friends/watsenaam
           p) e (talje     @ // fix stress and 1st e sound: petalje and compounds
           interpr) e (teer @' //stress and e sound interpreteer
           _) e (ks %E //move default stress in words starting with eks
@@ -635,6 +642,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           @) fonie        fun'i // kakofonie/simfonieorkes/telefonie
              fon (tein    f%On // move default stress: fontein/fonteinwater, etc.
           _) for (C       f%Or // formeel/formele/forseer/fortuin
+             formi (da    f%Orm%i // move default stress: formidabel/-e
           _) for (se_     f'Or // stress back to 1st slb; se rule: _) for (C 
              foto         fo@tu
              fo (togra    fo@ // move default stress: fotograaf and similar
@@ -718,6 +726,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              h (h
          @C) hal (sA      h'al // reikhalsend/waaghalsig
              hal (sstar   h%al // move default stress:
+             hand (o      hant? // fix d sound: handopsteek/handoplegging
           _) hane (C      hA:n@ // hanekam/hanekraai/hanepoot/hanetree
              hard (C@     h%art // hardhorend/hardkoppig/hardnekkig/hardvogtig
              hard (lo     hart // restore default stress: hardloop/hardloper
@@ -729,7 +738,9 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              hemel        he@m@l // hemelblou/hemelhoog and many compounds with hemel
           _) her (@P3     h%&r
              herder       h'&rd@r
-             here (_      he@r@
+             her (eK      he@r // here/herehuis/heretjie
+             her (eni     h%&r? // fix e sound and stress: herenig
+             her (eva     h&r? // fix e sound: herevalueer...
              hersen       h&rs@n // restore default stress and fix 2nd e sound: hersenskim/-me/-mig/hersenskudding
              hel          h&l
           _) helde        h'&ld@ // heldedade/heldedood/heldemoed...
@@ -756,11 +767,10 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              ie           i
           _) iese (C      ,is@ // iesegrimmig and derivitives
              ieus         i'Y@s // this ending always takes stress
+          C) i (g         @// figuur/figure/stoksielsaligalleenA
              i (tief      @
              i (tiew      @
         def) i (n         @
-          f) i (guu       @    //figuur
-          f) i (gure_     @    //figure at word end
           C) iater        i'A:t@r // psigiater/pediater
           C) iatrie       iatr'i // psigiatrie/pediatrie
           C) iatries      i'A:tris // psigiatries/pediatries
@@ -843,6 +853,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
          ar) is (_        =@s // but sekretaris/argivaris/kommissaris
       litar) is           'Is // but militaris
          AC) iste (_      'Ist@ // aktiviste/humaniste/kommuniste/pianiste/soliste/violiste
+         @C) isties       'Istis // kommunisties/liberalisties/humanisties
           @) iseer        is'e@r    // analiseer/kategoriseer             
           @) iseren (d    is'e@r@n  // analiserend/kategoriserend          
           @f) iek (_       'ik // manjefiek/compounds
@@ -962,6 +973,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              kolonel      kOl@n'&l
              ko (loni     k%u // kolonie/-s/kolonialisme/koloniseer
              kolo (ssa    k,Olu // move default stress: kolossaal/kolossale
+             kolo (sK     k%ulO // move default stress and fix 1st e sound: kolos/-se
              kombuis      kOmb'Yys
              ko (medi     k%u // move default stress, correct o sound
              komitee      kOm@te@
@@ -1065,6 +1077,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              media        mi:dia // compounds of media
              me (dium     mi: // fix e sound
              mee (doë     m%e@ // move default stress
+             meerder (jar m%e@rd@r // move default stress: meerderjarig/-e/-es/-verklaring
              medisyne m@d@s'eIn@ //medisyne and compounds
              meganies     m@x2'A:nis
           _) meege (@P5   m'e@x2@
@@ -1100,8 +1113,10 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              mevrou       m@fr'@U
              middagete    m'Idax2_e@t@ // middagete/s
              middel       mId@l     // middellyf/middelpunt/middelste/bemiddelend
+             middel (jar  m@d@l // move default stress: middeljarig and derivitives
              milit        m@l@t // militêr/militaris
              minag        m'Inax2   // minag/geminag/minagting/minagtend
+             minder (jar  m@n@r // move default stress: minderjarig and derivitives
              miner (A     m@n@r // mineraal and many compounds
              mi (neur     m%i // move default stress: mineur and compounds
              mikr (o      mikr
@@ -1114,7 +1129,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              mis (lik     m'Is // default stress again
           _) mis (m       m@s // mismaak/-te/mismoedig
              mis (noeg    m@s // stress on 2nd slb
-             mis (o       m@s_ // misoes/misopvatting
+             mis (o       mIs // misoes/misopvatting
              mis (plaas   m@s // stress on 2nd slb
              mis (rabel   m@s // stress on 2nd slb
              mis (reken   m@s // stress on 2nd slb
@@ -1194,6 +1209,8 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              netel        ne@t@l // netelig and derivitives/netel and compounds
              nommer (een  n%Om@r? // stress: nommereen in compounds like nommereenspeler
              normaal      nOrm'A:l // normaal/normaalweg/abnormaal
+             nostal (gie_N n%Ost%al // stress on last slb.: nostalgie
+             no (stalgie  n%O // stress on 2nd slb.: nostalgies
              nou (keu     n%@U // noukeurig/-e/-heid/onnoukeurig
              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
@@ -1287,6 +1304,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              omgewing     Omx2'e@vIN
              om (h        %Om // omhels/omhein/omhoog/omhul
              om (ha       Om // restore default stress: omhaal/omhang/omhaak
+             omkeer       Omke@r // restore default stress: omkeer/handomkeer  and similar
           _) omker (A     Omke@r // omkering/omkerende
              om (ring     %Om // move default stress
              om (sig      %Om // move default stress: omsigtig/-heid
@@ -1301,6 +1319,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              onheil (spel %Onh%eIl // stress: onheilspellend/e
              onreg        'Onr&x2 // stress: onreg/te
              on (regv+     %On // stress: onregverdig/e/heid
+             on (skuld_N  'On // restore default stress: onskuld
           _) ont (@P3     %Ont
              ont (d@      %On // remove t sound: ontdaan/belastingontduiking/ontdooi
              onteenseg    Onte@ns'&x2 // onteenseglik/e
@@ -1368,6 +1387,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              oppon (A     %Op@n // opponent/opponeer
              op (roerig   %Op // oproerig/-e/-heid, but oproer
              op (sienb    %Op // opsienbare/opsienbarend
+             opti (mA     %Opt%i // optimis/-me/-te/-ties/optimaal
              op (winde    %Op // move default stress: opwindend and derivitives
              organisasie  Orx2anis'A:si
           @) oties        'o@tis // antibioties/eksoties/eroties/neuroties
@@ -1383,9 +1403,11 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
 .group p
              p            p
              p (p
+          _) paarl        p&:r@L // Paarl/Paarlberg/Paarlvallei
              pajama       p@dZ'A:ma //pajama and compounds
              pak (A       pak? // pakesel/pakos/verpakafdeling
              pakistan p%ak%istan //first a and stress
+             pakke (t     p%akE // pakket/-te and compounds
              panga        paNga // fix g sound: panga/-s
              papaja       pap'AIa //papaja and compounds
              pam (C       p%am // move default stress: pamflet/pampoen/pampoentjies and compounds
@@ -1405,6 +1427,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              pastorie     pastur'i // pastorie/-paar/-moeder
           _) pa (tA       p%a // pateties/patee/patent/paterniteit
              pa (trA      p%a // patrollie/patroon/patrys
+             pawil (joe   p%av@l // move default stress and fix a sound: pawiljoen and compounds
              polio        po@li;u // polio and compounds
 //             @) pene (_   p@n@ // geroepene/ontslapene/uitgeworpene
              pene (_   p@n@ // geroepenes/ontslapenes/uitgeworpenes
@@ -1702,6 +1725,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           @) stiek        st'ik // statistiek/akoestiek/artistiek and many similar
           @) sties        =st%is // statisties/akoesties/artisties and many similar
              sti (pulA    st@ // stipuleer/stipulering/stipulasie
+             stof (o      stOf? // fix 1st o sound: stofomslag/-omslae/stofopskoppery
              stok (A      stOk? // stokagtig/stokinsek/stokoud
              stok (e      sto@k // stoker/-y
              storm        stOr@-m
@@ -1715,7 +1739,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              su (mmier    s%W // move default stress: sumier/-e
              swag         sv'ax2
              swart (gal   sw%art // move default stress: swartgallig
-             swerk        sv'&rk
+             swerk        sv&rk
              swinkel      svINk@l
 
 .group t
@@ -1727,6 +1751,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           _) ta (ma       t%a // tamatie and compounds
           _) ta (mb       t%a // tamboer and compounds/tambotie and compounds
           _) tant (e      tA~nt // nasalise
+             taverne      t%af&rn@ // fix stress and 1st e sound: taverne and compounds
              te (aa       t@ // beroerteaanval/geboorteaanwas/lenteaand...
           _) tekere       t@ke@r@ // move default stress and correct e sounds
              tele (C      t%&l@ // telefoneer/telekommunikasie, etc.
@@ -1746,6 +1771,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           _) teraarde     t%&r?A:rd@ // move default stress and fix e sounds: teraardebestelling/-s
           n) terie        t@r'i // galanterie/infanterie and compounds
           _) tering       te@r@N // tering and compounds
+             tesou (rie t%Es%u //tesourie and compounds
       moles) tering       te@r@N // molestering/kindermolestering
           _) ter (l       t@r // move default stress: terloops/-e
           @) term (_      t&r@ // correct pronunciation of e
@@ -1761,6 +1787,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           A) teur         t'Y@r // outeur/ouditeur/operateur
           k) teur         t'Y@r // akteur/inspekteur
              tabak        tab'ak;
+             teen (stryd  t%e@n // move default stress: teenstrydig/-e/-heid
              teen (woor   t%e@n // teenwoordig/heid/verteenwoordiging
           _) te (we       t@ // move default stress and fix 1st e sound: teweeg/tewerkstelling
           _) tewens       te@v@ns // fix both e sounds
@@ -1893,6 +1920,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              vangen       f'aN@n // gevangene/gevangenis/bevangenheid
              van (pas     f%an // fix stress: onvanpas/-te
           @) ve (_        _^_EN    //words ending in ve is English
+             veel (jar    f%e@l // move default stress: veeljarig and derivitives
           A) ves (_       _^_EN // words ending in ves after vowel are English
 
              ve (l        f& // maagvel, stress on 1st slb
@@ -1924,6 +1952,7 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              verbete      f@rb'e@t@ // verbete/verbetenheid
              verte (l     f@rt& // oorvertelling/rondvertel and similar
              ver (velA    f@r // vervelig/verveling (see: _) ver (@P3     f@r
+             vi (cto@     v%i // fix v and i sounds: victoriaans/-e
              video v'idi;u //video and compounds
 
              ville        _^_EN
@@ -1960,11 +1989,12 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
           _) voorge (@P6  f'o@rx2@
              voorspe (l     fo@rsp'& // voorspel/voorspelling/voorspelbaar/onvoorspelbaar
              voor (sk     fo@r // voorskiet/voorskot/voorskrif/voorskryf
+             voorstedeli (k f%o@rste@d@l@ // move default stress: voorstedelik/-e vs voorstede
              voor (trek   fo@r // voortrek/voortrekker and compounds
              voort (v@@   f%o@rt // voortvarend/voortvlugtige
           _) vooruit      fo@r'Yyt // vooruit/vooruitsig/vooruitbeplanning
              vooruit (strew fo@rYyt' // change stress
-             vorm         f'Or@m
+             vorm         fOr@m
              vreemde      fr'e@md@  // vreemde/s/vreemdeling
              vriendi (n   frind'I // vriendin/vriendinne/vriendinnetjies
              vrygewig     freIx2'e@v@x2 // vrygewig/-e|-heid
@@ -1993,10 +2023,12 @@ C) ensie (_          @) enswaar (dig @nsv'A:r // noemenswaardige/bejammerenswaar
              w (ese_ v //words ending in wese
           t) w            w
          it) w            v // inkuitwisser/witwyn/uitwoed/witwatersrand
-          @) wa (_        vA: // words ending in -wa: afleweringswa
+          @) wa (_N       vA: // words ending in -wa: afleweringswa
           @) w (aen       v // strydwaens/afleweringswaentjie
           @s) w (And       v // kranswand/kuswind/meswond
           @s) w (An_       v // plurals of the above in -de: de treate
+             wapen        vA:p@n // fix problems with compounds and derivitives of wapen: ontwapening/wapengeweld
+//wapenopleiding
          @s) ware         vA:r@ // kruideniersware/bronsware/glasware/kombuisware
         bes) ware         wA:r@ // geloofsbesware/gewetensbesware
           @) wekkend      v'Ek@nt // stress on wekkend at end compounds
diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index 297f5d5d..a47ec3fe 100644
--- a/dictsource/dict_phonemes
+++ b/dictsource/dict_phonemes
@@ -66,9 +66,9 @@ Dictionary en_dict
 
 0    3    3:   @    @-   @2   @5   @L   
 a    a2   A:   A@   aa   aI   aI@  aU   
-aU@  E    e@   eI   I    I2   i:   i@   
-IR   O    O:   o:   O@   o@   OI   oU   
-O~   U    u:   U@   V    VR   
+aU@  E    e@   eI   I    i    I2   i:   
+i@   IR   O    O:   o:   O@   o@   OI   
+oU   O~   U    u:   U@   V    VR   
 
 :    ;    b    C    d    D    dZ   f    
 g    g-   h    j    k    l    L    m    
@@ -112,12 +112,12 @@ S    s2   t    v    Z
 
 Dictionary fr_dict
 
-@    @-   a    A    A~   e    E    E:   
-E~   i    o    O    O    O~   u    W    
-w^i  W~   y    Y    
+@    @-   a    A    A~   e    E    E~   
+i    o    O    O~   u    W    w^i  W~   
+y    Y    y"   
 
-(o)  :    ;    b    c    d    dZ   f    
-g    h    j    k    l    L    l/2  m    
+(i)  :    ;    b    c    d    dZ   f    
+g    h    j    k    l    L    l/   m    
 n    N    n^   p    r    R    s    S    
 t    t2   tS   v    w    z    Z    z2   
 
@@ -139,9 +139,9 @@ t.h  th   v    w    x    z
 Dictionary hr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   eI   E~   i    I    
-i:   iI   l-   o    o:   oI   oU   O~   
-r-   u    U    u:   uI   
+aU   E    e    e:   E~   i    I    i:   
+l-   o    o:   oU   r-   u    U    u:   
+y    
 
 *    b    d    dZ   dZ;  f    g    h    
 j    k    l    l^   m    n    N    n^   
@@ -284,7 +284,7 @@ Dictionary pt_dict
 
 &    &/   &U~  &~   @    @-   a    A    
 aI   aU   e    E    eI   EI   eU   EU   
-i    i/   iU   i~   o    O    oI   OI   
+e~   i    i/   iU   o    O    oI   OI   
 o~   U    u    uI   u~   y    
 
 *    :    ;    b    C    d    dZ   f    
diff --git a/dictsource/en_list b/dictsource/en_list
index ff86babf..e75aa73c 100644
--- a/dictsource/en_list
+++ b/dictsource/en_list
@@ -2674,5 +2674,5 @@ like             laIk          $strend2
 
 
 // General American
-?3 status        statVs
+// ?3 status        statVs
 
diff --git a/dictsource/hr_list b/dictsource/hr_list
index 467b74cb..862d98ac 100644
--- a/dictsource/hr_list
+++ b/dictsource/hr_list
@@ -34,77 +34,77 @@ z     z@
 
 _??   znak          // unknown symbol
 _?A   slovo         // unknown letter
-©     'aUtorsk&||p@-*'av&
-%     posto
+©     'aUtoRsk&||p@-*av&
+%     p'osto
 +     plus
-€     Eu*o
-@     _Et
-&     _End
+€     'euRo
+@     _'at
+&     _'end
 !     'usklItSnIk
 :     dv'ototSk&
-#     b@-*'oj
-/     k@-*'oz
+#     b@-*'oj_
+/     k@-*'oz_
 \\    b'EkslES
-^     tsirkUmflEks
-~     tild&
-¤     valUt&
-§     oldom&k
-µ     mikro
-¶     tSlan&k
+^     ts'irkumfleks
+~     t'ild&
+¤     v'alut&
+§     'odlom&k
+µ     m'ik@-*o
+¶     tSl'an&k
 °     st'up&n^
 _"    n'avodnIk
-_‚    'otvo*,En@||n'avodnIk
-_„    sp'utSEn@||n'avodnIk
-…     t@-*'i_||t'otSke
+_‚    'otvoReni||n'avodnIk
+_„    sp'uSteni||n'avodnIk
+…     t@-*'i||t'otSke
 †     k@-*'iZ
-‡     dv'ost@-*'uk@||k@-*'iZ
+‡     dv'ost@-*Uki||k@-*'iZ
 ‰     p@-*'omil
-_‹    'otvo*,En@||n'avodnIk
-_‘    'otvo*,En@||n'avodnIk
-_’    jedn'ost@-*'uk@||n'avodnIk
-_“    'otvo*,En@||n'avodnIk
-_”    zatvo*,En@||n'avodnIk
-•     k@-*'upna||t'otSk@
-_–    en||ts'r-t&
-_—    em||ts'r-t&
-™     p@-*'oizv'odZatS
-˘     b@-*,EvIs
-¨     p@-*Ijegl&s
-_«    'otvo*,En@||n'avodnIk
-_­    p@-*Ivr,Emen&||tsr-tIts&
+_‹    'otvoReni||n'avodnIk
+_‘    'otvoReni||n'avodnIk
+_’    j'ednost@-*'uki||n'avodnIk
+_“    'otvoReni||n'avodnIk
+_”    z'atvoReni||n'avodnIk
+•     k@-*'upna||t'otSk&
+_–    En||ts'r-t&
+_—    Em||ts'r-t&
+™     p@-*'o'izvodZ&tS
+˘     b@-*'evis
+¨     p@-*'ijegl&s
+_«    'otvoReni||n'avodnIk
+_­    p@-*'iv@-*emen&||ts'r-t'its&
 ·     p'ut&
-¸     s,EdIl&
-_»    z'atvo*,En@||n'avodnIk
-®     r,Egist@-*'atsIj&
-ł     l@||s&||tsr-tItsom
+¸     sed'il&
+_»    z'atvoReni||n'avodnIk
+®     R'egist@-*atsIj&
+ł     l@||s&||ts'r-t'itsom
 ×     p'ut&
-÷     p'od'ijeljen'o
+÷     p'odijel^,eno
 
-_$    dol&r
-_-    minus
-_*    zvj'ezdIts@
-_=    jedn&ko
-_@    t'r-gov,&tSko||'i
-_(    'otvo*,En&||'ok@-*Ugl&
-_)    z'atvo*,En&||'ok@-*Ugl&
-_'    apost@-*of
-_*    zvjezdIts&
-_,    za*Ez
-_-    tsr-tIts&
-_.    totSk&
+_$    d'ol&R
+_-    m'inus
+_*    zvj'ezdits@
+_=    j'edn&ko
+_@    t'r-g'ov&tSko||'a
+_(    'otvoRen&||z'ag@-*ad&
+_)    z'atvoRen&||z'ag@-*ad&
+_'    'apost@-*of
+_*    zvj'ezdits&
+_,    z'aRez
+_-    ts'r-t'its&
+_.    t'otSk&
 _;    t'otSk&z,a*Ez
-_<    man^I
-_=    jedn&ko
-_>    vEtS;I
-_?    upItnIk
-_&    t'r-gov,&tSk||'a
-_[    'otvo*,En&||'ugl&t&
-_]    z'atvo*,En&||'ugl&t&
+_<    m'an^i||'od
+_=    j'edn&ko
+_>    v'etSi||'od
+_?    'upitnIk
+_&    t'r-g'ov&tSko||'i
+_[    'otvoRen&||'ugl&t&
+_]    z'atvoRen&||'ugl&t&
 __    ts'r-t&
-_`    g@-*'avIs
-_{    'otvo*,En&||v'itItS,&st&
-_|    okom,Its&
-_}    z'atvo*,En&||v'itItS,&st&
+_`    g@-*'avis
+_{    'otvoRen&||v'ititS&st&
+_|    'okomits&
+_}    z'atvoRen&||v'ititS&st&
 
 
 
@@ -112,7 +112,7 @@ _}    z'atvo*,En&||v'itItS,&st&
 // Numbers
 _0    n'ul&
 _1    j'ed&n
-_2    dv'a
+_2    d'v'a
 _2f   dv'ije
 _3    t@-*'i
 _4    tS'EtI*I
@@ -188,55 +188,203 @@ xxxviii  $abbrev
 xxxix	$abbrev
 
 // Abbreviations
-ab	$only $abbrev
+aaa	$abbrev
+aac	$abbrev
+ab	$only $abbrev $capital
 abc	$abbrev
+abk	$only $abbrev
 abs	$abbrev
+acc $only $abbrev
+acf $only $abbrev
+acfm $abbrev
+acg $only $abbrev
+acgm $abbrev
+acl $only $abbrev
+acm $only $abbrev
+acw $only $abbrev
+add	$only $abbrev
+adn $only $abbrev
+adp $only $abbrev
+adsl	$abbrev
 agm	$abbrev
+ahk $only $abbrev
+aif $only $abbrev
+aip $only $abbrev
+alg $only $abbrev
+alm $only $abbrev
 amd	$only $abbrev
+amf $only $abbrev
 amg	$only $abbrev
+aph $only $abbrev
+apj $only $abbrev
+apl $only $abbrev
+apm $only $abbrev
+app $only $abbrev
 arg	$only $abbrev
+arj	$only $abbrev
+asc $only $abbrev
+asf $only $abbrev
+asm $only $abbrev
+asn $only $abbrev
+asp $only $abbrev
+asx $only $abbrev
+atf $only $abbrev
 atp	$abbrev
+av	$only $abbrev
 avg	$abbrev
+avr $only $abbrev
+awb $only $abbrev
+awt $only $abbrev
 brf	$abbrev
 brl	$abbrev
 brx	$abbrev
 cca	$abbrev
+cda $only $abbrev
 cdr	$abbrev
 cdrw	$abbrev
+cgi $abbrev
 clr	$abbrev
+cpe $only $abbrev
+cpu $only $abbrev
 cr	$only $abbrev
+crt $only $abbrev
 ctrl	$abbrev
+daa $only $abbrev
 doo	$abbrev
+dox $only $abbrev
+dqy $abbrev
+dsr $only $abbrev
+ear $only $abbrev
 ecdl	$only $abbrev
+ecp $only $abbrev
+ecs $only $abbrev
+elm $only $abbrev
+emf $only $abbrev
+emh $only $abbrev
+eml $only $abbrev
+ems $only $abbrev
+epf $only $abbrev
+eq $only $abbrev
 esc	$only $abbrev
+etd $only $abbrev
 eu	$only $abbrev
 eur	$only $abbrev
+exc $only $abbrev
 faq	$abbrev
 fbi	$abbrev
+ffa $only $abbrev
 fr	$only $abbrev
 frm	$abbrev
+frt $only $abbrev
 frx	$abbrev
+gho $only $abbrev
 gr	$only $abbrev
 grr	$abbrev
 grrr	$abbrev
 grp	$abbrev
 grps	$abbrev
+grs $only $abbrev
+grx $only $abbrev
+gui $only $abbrev
 hho	$abbrev
 hr	$only $abbrev
 hrk	$only $abbrev
-hrt	$only $abbrev
+hrt	$only $abbrev $capital
 hrv	$only $abbrev
+hta $only $abbrev
 hzzo	$abbrev
 ibm	$abbrev
+icc $only $abbrev
+icm $only $abbrev
+ics $only $abbrev
+idb $only $abbrev
+idc $only $abbrev
+idm $only $abbrev
+iff $only $abbrev
+ifu $only $abbrev
+ilk $only $abbrev
+img $only $abbrev
+iml $only $abbrev
+isdn $abbrev
+isl $only $abbrev
+isp $only $abbrev
+iss $only $abbrev
+iq $only $abbrev
+iqy $only $abbrev
+itw $only $abbrev
+itz $only $abbrev
+ivf $only $abbrev
+jpi $only $abbrev
 jrr	$abbrev
+jse $only $abbrev
+lha $abbrev
+liq $only $abbrev
+maq $only $abbrev
+maw $only $abbrev
+mda $only $abbrev
+mde $only $abbrev
+mdi $only $abbrev
+mga $only $abbrev
+mge $only $abbrev
+mgi $only $abbrev
+mpa $only $abbrev
+mpe $only $abbrev
+mpr $only $abbrev
+msi $only $abbrev
+mup $abbrev $capital
+nco $only $abbrev
+nfo $only $abbrev
+nji $only $abbrev
 nr	$only $abbrev
+nra $only $abbrev
+nrb $only $abbrev
+nrc $only $abbrev
+nre $only $abbrev
+nrf $only $abbrev
 nrg	$abbrev
+nrh $only $abbrev
+nri $only $abbrev
+nrm $only $abbrev
+nrq $only $abbrev
+nrs $only $abbrev
+nru $only $abbrev
+nrw $only $abbrev
+nsa $only $abbrev
+nsi $only $abbrev
 nvda	$abbrev
+obd $only $abbrev
+obj $only $abbrev
+obt $only $abbrev
+obz $only $abbrev
+ocr $only $abbrev
+ocx $only $abbrev
 oem	$abbrev
 off	$only $abbrev
+oft $only $abbrev
+ofx $only $abbrev
+ogc $only $abbrev
+ogg	$only $abbrev
+ogl $only $abbrev
 omw	$abbrev
+oqy $only $abbrev
+os $only $abbrev $capital
+oss $only $abbrev
+otf $only $abbrev
+otm $only $abbrev
+pda $abbrev
+pdi $only $abbrev
+pgi $only $abbrev
+pho $only $abbrev
+pko $only $abbrev
+pma $only $abbrev
+ppa $only $abbrev
 pr	$only $abbrev
+prf $only $abbrev
+prg $only $abbrev
 prn	$abbrev
+prt $only $abbrev
+qbr $abbrev
+qpr $abbrev
 raw	$only $abbrev
 rb	$abbrev
 rba	$abbrev
@@ -249,10 +397,17 @@ rds	$abbrev
 rgb	$abbrev
 rh	$only $abbrev
 rk	$only $abbrev
-rn	$abbrev
 rm	$only $abbrev
+rma $only $abbrev
+rme $only $abbrev
+rmf $only $abbrev
+rmi $only $abbrev
+rmt $only $abbrev
 rmx	$abbrev
+rn $only $abbrev
+rnk $only $abbrev
 rp	$only $abbrev
+rqy $only $abbrev
 rs	$abbrev
 rss	$abbrev
 rta	$abbrev
@@ -260,19 +415,56 @@ rtf	$abbrev
 rtl	$abbrev
 rttl	$abbrev
 rtv	$abbrev
-rx	$abbrev
 rw	$abbrev
+rwo $only $abbrev
+rx	$abbrev
+sbr $only $abbrev
 scr	$only $abbrev
 sr	$only $abbrev
 srd	$only $abbrev
+ssa $only $abbrev
+sys $only $abbrev
+tpu $only $abbrev
+udf $only $abbrev
+udl $only $abbrev
 udt	$abbrev
+uhh $abbrev
+uif $only $abbrev
+uip $only $abbrev
 url	$only $abbrev
+usd	$only $abbrev
+usr	$only $abbrev
+uss	$only $abbrev
+uu $only $abbrev
+uue $only $abbrev
+uup $only $abbrev
+uxd $only $abbrev
 vba	$only $abbrev
+vbe $only $abbrev
 vbr	$abbrev
 vga	$abbrev
+wax $only $abbrev
 wbr	$abbrev
+wiz $only $abbrev
+wma $only $abbrev
+wri $only $abbrev
+wta	$abbrev
+xam $only $abbrev
+xba $only $abbrev
+xiw $only $abbrev
+xla $only $abbrev
+xpa $only $abbrev
+xpi $only $abbrev
+xsi $only $abbrev
+xxa $only $abbrev
+xxe $only $abbrev
 xy	$abbrev
+xyz	$abbrev
+yu $only $abbrev
+zaa $only $abbrev
+zoo $only $abbrev
 
+br	$dot $abbrev
 dr	$dot $abbrev
 mr	$dot $abbrev
 mrs	$dot $abbrev
@@ -314,7 +506,6 @@ ili      $u $pause    // or
 
 // Auxillary verbs
 li       $u      // question
-da       $u+     // ??
 
 sam      $u      // to be, short form
 si       $u
@@ -362,7 +553,11 @@ u        u    $atend
 
 
 // Exceptions
-utf      u||te||ef
-
-
+docx	d'ots||'iks
+jpeg	j@2||p'eg
+macx	m'ats||'iks
+potx	p'ot||'iks
+sisx	s'is||'iks
+start	st'aRt
+utf	u||te||ef
 
diff --git a/dictsource/hr_rules b/dictsource/hr_rules
index 6c591c50..2f2f16ad 100644
--- a/dictsource/hr_rules
+++ b/dictsource/hr_rules
@@ -3,7 +3,7 @@
 
 .group a
         a        a
-        aj (K    aI
+        a (j     A
         a (r     A        // don't reduce to [&]
 
 .group b
@@ -30,7 +30,8 @@
         e        E
      j) e        e
         e (j     e
-        ej (K    eI
+     r) e        e
+    ._) exe (%ekse        // filetype
 
 .group f
         f        f
@@ -44,10 +45,11 @@
 
 .group i
         i        i
-        ij (K    iI
+    ._) ini (%ini         // filetype
 
 .group j
         j        j
+    XA) j (_     j_      // short pause after final [j] in one-syllable words
 
 .group k
         k        k
@@ -70,7 +72,6 @@
 .group o
         o        o
         ou       oU
-        oj (K    oI
 
 .group p
         p        p
@@ -100,8 +101,6 @@
 
 .group u
         u        u
-        uj (K    uI
-     X) uj (_    u'i
 
 .group v
         v        v
@@ -135,7 +134,7 @@
         ü        _^_DE
         ß        _^_DE
 
-        $        dol&r
+        $        d'ol&R
 
         .        totSk&
         . (.     _:
@@ -146,52 +145,52 @@
    C_)  - (_D    _
     --) -
 
-        *        zvj'ezdIts@
+        *        zvj'ezdits&
     *)  * (*
         **
    **)  * (_     _::
 
-        =            _j'edn&ko_
+        =            _j'edn&ko
         = (==        
     =)  = (=         
    ==)  = (_         _::
 
 .group 0xce   // Greek letters
 
-	α	alf&_
-	ά	alf&_||tonos
-	β	b'et&_
-	γ	g&m&_
-	δ	delt&_
-	ε	Epsilon
-	έ	Epsilon||tonos
-	ζ	zet&_
-	η	et&_
-	ή	et&_||tonos
-	θ	txet&_
-	ι	jot&_
-	ί	jot&_||tonos
-	κ	k&p&_
-	λ	l&md&_
-	μ	mi_
-	ν	ni_
-	ξ	k_si_
-	ο	omi_k@-*on_
+	α	'alf&
+	ά	'alf&||t'onos
+	β	b'et&
+	γ	g'am&
+	δ	d'elt&
+	ε	'epsIlon
+	έ	'epsIlon||t'onos
+	ζ	z'et&
+	η	'et&
+	ή	'et&||t'onos
+	θ	tx'et&
+	ι	j'ot&
+	ί	j'ot&||t'onos
+	κ	k'ap&
+	λ	l'amd&
+	μ	m'i
+	ν	n'i
+	ξ	ks'i
+	ο	'omIk@-*on_
 
 .group 0xcf   // Greek letters
 
-	π	pi_
-	ρ	@-*o_
-	σ	sigm&_
-	ς	grtSko_||z&vrS@no_||sigm&_
-	τ	t&U_
-	υ	grtSki_||IpsIlon_
-	ύ	grtSki||IpsIlon_||tonos
-	φ	fi_
-	χ	h_i
-	ψ	pss'I
-	ω	omeg&_
-	ώ	omeg&_||tonos
-	ό	omi_k@-*on_||tonos
+	π	p'i
+	ρ	R'o
+	σ	s'igm&
+	ς	gr-tSko_||z'avr-Sno_||s'igm&
+	τ	t'au
+	υ	gr-tSki_||'ipsIlon
+	ύ	gr-tSki||'ipsIlon||t'onos
+	φ	f'i
+	χ	x'i
+	ψ	ps'i
+	ω	'omeg&
+	ώ	'omeg&||t'onos
+	ό	'omIk@-*on||t'onos
 
 
diff --git a/phsource/compile_report b/phsource/compile_report
index 570ebc2a..45b99b00 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -1,39 +1,39 @@
 34 phoneme tables
           new total
-    base  95   95
-      en  52  142
-    en_n  29  142
-   en_us  36  142
-   en_sc  39  144
-   en_rp  34  142
-   en_wm  30  142
-      af  37  126
-      cy  29  121
-      de  29  119
-      eo  13  107
-      fi  40  126
-      fr  32  117
-   fr_ca  11  117
-      hi  49  130
-      hu  24  113
-      nl  26  116
-      pl  15  106
-      sk  26  123
-      cs   5  123
+    base  96   96
+      en  52  143
+    en_n  29  143
+   en_us  37  143
+   en_sc  39  145
+   en_rp  34  143
+   en_wm  30  143
+      af  37  127
+      cy  29  122
+      de  29  120
+      eo  13  108
+      fi  40  127
+      fr  32  118
+   fr_ca  11  118
+      hi  49  131
+      hu  24  114
+      nl  26  117
+      pl  15  107
+      sk  26  124
+      cs   5  124
       hr  25  133
-      ru  36  123
-      it  25  114
-      es   6  114
-      pt  28  131
-   pt_pt  20  131
-      ro  36  138
-      el   8  114
-      sv  25  117
-      no  28  121
-      is  32  120
-      vi  41  132
-  zh_yue  32  123
-      sw  14  104
+      ru  36  124
+      it  25  115
+      es   6  115
+      pt  28  132
+   pt_pt  20  132
+      ro  36  139
+      el   8  115
+      sv  25  118
+      no  28  122
+      is  32  121
+      vi  41  133
+  zh_yue  32  124
+      sw  14  105
 
   3  b/b            base hi ro
   2  b/b_           base hi
@@ -416,7 +416,7 @@
   1  vowel/3_3      en_rp
   3  vowel/3_en     en en_wm af
   2  vowel/@_4      nl hr
-  3  vowel/8_2      en_us hr sv
+  2  vowel/8_2      en_us sv
   1  vowel/8_3      zh_yue
  11  vowel/a        en_n cy de hu nl pl sk hr
   4  vowel/a#       en_sc it pt
@@ -490,12 +490,12 @@
   2  vowelr/aa_r    en_sc
   1  vowelr/oo_r    en_sc
   1  vowelr/o_r     en_sc
-  3  vowelr/r-voc   hi sk
+  4  vowelr/r-voc   hi sk hr
   2  vowelr/V3_r    en en_sc
   1  vowelr/V_r     en
   7  vowel/u        en_n cy de eo fr cs
   5  vowel/u#       en en_sc
-  3  vowel/u_2      fi sk ro
+  4  vowel/u_2      fi sk hr ro
   1  vowel/u#_2     sv
   1  vowel/u_3      ro
   1  vowel/u#_3     en_n
@@ -509,7 +509,7 @@
   2  vowel/uu_2     de it
   1  vowel/uu_3     af
   2  vowel/uu_4     fi sv
-  8  vowel/uu_bck   fr_ca hi hu hr pt no zh_yue
+  7  vowel/uu_bck   fr_ca hi hu pt no zh_yue
   2  vowel/V        en en_sc
   3  vowel/V_2      af ru
   3  vowel/V_3      en_rp hi vi
@@ -610,7 +610,7 @@
   5  w/xw           base
  20  x/b            base hi ro is
   1  x/b_           base
-  9  x/d            base hi hr el is
+ 10  x/d            base en_us hi hr el is
  14  x/d_           base fi fr hi pl hr ru it ro el is sw
  23  x/d_dnt        base fi fr hi hu pl ru it ro sw
   6  x/d_pzd        pl ru
diff --git a/phsource/l/_l b/phsource/l/_l
index a3fc544d..77345bf1 100644
Binary files a/phsource/l/_l and b/phsource/l/_l differ
diff --git a/phsource/l/l b/phsource/l/l
index 44af64f6..a4621aab 100644
Binary files a/phsource/l/l and b/phsource/l/l differ
diff --git a/phsource/l/la b/phsource/l/la
index acc8c310..7f426a50 100644
Binary files a/phsource/l/la and b/phsource/l/la differ
diff --git a/phsource/ph_af b/phsource/ph_af
index 6f2b862a..fba9fa9f 100644
--- a/phsource/ph_af
+++ b/phsource/ph_af
@@ -259,8 +259,8 @@ phoneme r
   length 60
   vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
   vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
-  formants r3/r_trill+r3/r_trill3.wav%99
-  before _ r3/r_trill+r3/r_trill3.wav%99
+  formants r3/r_trill+r3/r_trill3.wav%100
+  before _ r3/r_trill+r3/r_trill3.wav%100
   trill  
   lengthmod 6
 endphoneme
diff --git a/phsource/ph_croatian b/phsource/ph_croatian
index 87ac80e2..058c938f 100644
--- a/phsource/ph_croatian
+++ b/phsource/ph_croatian
@@ -76,12 +76,6 @@ phoneme o
   formants vowel/oo_1
 endphoneme
 
-phoneme 8
-  vowel starttype (o) endtype (o)
-  length 140
-  formants vowel/8_2
-endphoneme
-
 
 phoneme u
   vowel starttype (u) endtype (u)
@@ -93,7 +87,8 @@ endphoneme
 phoneme U
   vowel starttype (u) endtype (u)
   length 140
-  formants vowel/uu_bck
+//  formants vowel/uu_bck
+  formants vowel/u_2
 endphoneme
 
 
@@ -184,6 +179,12 @@ phoneme x
   switchvoicing Q
 endphoneme
 
+phoneme r-
+  vowel  starttype (@)  endtype (@)
+  length 240
+  formants vowelr/r-voc
+endphoneme
+
 phoneme R
   liquid
   vowelin  f1=0  f2=1600 -300 300  f3=-200 80
diff --git a/phsource/ph_english_us b/phsource/ph_english_us
index 9e48f4db..af45ffc7 100644
--- a/phsource/ph_english_us
+++ b/phsource/ph_english_us
@@ -52,7 +52,7 @@ endphoneme
 
 phoneme a
   vowel  starttype (a)  endtype (@)
-  length 180
+  length 200
   formants vwl_en_us/a
   reduceto a2  0
 endphoneme
@@ -61,7 +61,7 @@ endphoneme
 phoneme a2
   vowel  starttype (@)  endtype (@)
   unstressed
-  length 140
+  length 150
   formants vowel/a#_3
   linkout r-
 endphoneme
@@ -69,7 +69,7 @@ endphoneme
 
 phoneme aa   //   'bath' etc.
   vowel  starttype (a)  endtype (@)
-  length 190
+  length 200
   formants vwl_en_us/a
 //  formants vowel/a_2
   linkout r-
@@ -296,4 +296,13 @@ phoneme r/   // used for [r] when not preceding a vowel
 endphoneme
 
 
+phoneme t#    // reduced [t] as in "city"
+  vls alv stop
+  vowelin f1=2  f2=1700 -300 300  f3=-100 80
+  vowelout f1=2 f2=1700 -300 300  f3=-100 80
+  lengthmod 2
+  wave  x/d%70
+endphoneme
+
+
 
diff --git a/phsource/ph_welsh b/phsource/ph_welsh
index 357ee55e..90b3fde8 100644
--- a/phsource/ph_welsh
+++ b/phsource/ph_welsh
@@ -205,18 +205,17 @@ endphoneme
 //===========
 
 phoneme r
-  liquid
+  liquid  starttype #r endtype #r
   length 60
   vowelin  f1=2  f2=2700 -300 -200  f3=-1300 80  
   vowelout f1=2  f2=1700 -300 -200  f3=-1300 80
-  formants r3/r_trill+r3/r_trill3.wav%99
-  before _ r3/r_trill+r3/r_trill3.wav%99
+  formants r3/r_trill+r3/r_trill3.wav%100
+  before _ r3/r_trill+r3/r_trill3.wav%100
   trill  
   lengthmod 6
 endphoneme
 
 
-
 phoneme g
   vcd vel stop
   vowelin  f1=2  f2=2300 200 300  f3=-300 80
diff --git a/phsource/phonemes b/phsource/phonemes
index 52a254cc..4a9a5928 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -27,6 +27,7 @@ phonemenumber 20 -      // syllabic consonant
 phonemenumber 21 _^_    //  Change language
 phonemenumber 22 _X1    // a language specific action
 phonemenumber 23 _|     // very short pause
+phonemenumber 24 t#     // reduced version of [t]
 
 // The base phoneme table contains the utility phonemes, the consonants,
 // and a schwa.  The vowels are defined in the language specific phoneme
diff --git a/phsource/r3/r_trill3.wav b/phsource/r3/r_trill3.wav
index f29faa83..ef711c13 100644
Binary files a/phsource/r3/r_trill3.wav and b/phsource/r3/r_trill3.wav differ
diff --git a/phsource/r3/r_trill4.wav b/phsource/r3/r_trill4.wav
new file mode 100755
index 00000000..f29faa83
Binary files /dev/null and b/phsource/r3/r_trill4.wav differ
diff --git a/phsource/vwl_en_us/a b/phsource/vwl_en_us/a
index dfb450af..83e46101 100644
Binary files a/phsource/vwl_en_us/a and b/phsource/vwl_en_us/a differ
diff --git a/phsource/w/_w b/phsource/w/_w
index 1e7438aa..cfde5014 100644
Binary files a/phsource/w/_w and b/phsource/w/_w differ
diff --git a/phsource/w/w b/phsource/w/w
index 622e0ce3..28f2e10a 100644
Binary files a/phsource/w/w and b/phsource/w/w differ
diff --git a/phsource/w/wi b/phsource/w/wi
index a192d82e..7ccf9c96 100644
Binary files a/phsource/w/wi and b/phsource/w/wi differ
diff --git a/phsource/w/wi2 b/phsource/w/wi2
index e2519a88..9b21e189 100644
Binary files a/phsource/w/wi2 and b/phsource/w/wi2 differ
diff --git a/src/dictionary.cpp b/src/dictionary.cpp
index e9baae1c..59f02aa2 100755
--- a/src/dictionary.cpp
+++ b/src/dictionary.cpp
@@ -2041,10 +2041,20 @@ void Translator::MatchRule(char *word[], const char *group, char *rule, MatchRec
 					break;
 
 				case RULE_NOVOWELS:
-					if(word_vowel_count== 0)
-						match.points += 19;
-					else
-						failed =1;
+					{
+						char *p = pre_ptr - letter_xbytes - 1;
+						while(letter_w != RULE_SPACE)
+						{
+							if(IsLetter(letter_w,LETTERGP_VOWEL2))
+							{
+								failed = 1;
+								break;
+							}
+							p -= utf8_in(&letter_w,p,1);
+						}
+						if(!failed)
+							match.points += (19-distance_left);
+					}
 					break;
 
 				case RULE_IFVERB:
diff --git a/src/phoneme.h b/src/phoneme.h
index 470a2560..a93065a9 100755
--- a/src/phoneme.h
+++ b/src/phoneme.h
@@ -77,6 +77,7 @@
 #define phonSWITCH      21
 #define phonX1          22      // a language specific action
 #define phonPAUSE_VSHORT 23
+#define phonT_REDUCED   24
 
 
 // place of articulation
diff --git a/src/phonemelist.cpp b/src/phonemelist.cpp
index 14b81554..eeb16874 100755
--- a/src/phonemelist.cpp
+++ b/src/phonemelist.cpp
@@ -408,16 +408,16 @@ void Translator::MakePhonemeList(int post_pause, int start_sentence)
 			}
 		}
 
-#ifdef deleted
-// experimenting with [t] glottaling
-if((ph->mnemonic == 't') && ((prev->type == phVOWEL) || (prev->mnemonic == 'n')))
-{
-	if(((plist2+1)->sourceix != 0) || ((plist2-1)->stress == 4) && (next->type == phVOWEL))
-	{
-		ph = phoneme_tab[phonGLOTTALSTOP];
-	}
-}
-#endif
+		if(langopts.param[LOPT_REDUCE_T])
+		{
+			if((ph->mnemonic == 't') && (plist2->sourceix == 0) && ((prev->type == phVOWEL) || (prev->mnemonic == 'n')))
+			{
+				if(((plist2+1)->sourceix == 0) && ((plist2+1)->stress < 4) && (next->type == phVOWEL))
+				{
+					ph = phoneme_tab[phonT_REDUCED];
+				}
+			}
+		}
 
 		if((ph->reduce_to != 0) && (ph->type != phVOWEL) && !(plist2->synthflags & SFLAG_DICTIONARY))
 		{
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index e2596c4b..d3b8eec8 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.25.17  04.Jun.07";
+const char *version_string = "1.25.18  06.Jun.07";
 const int version_phdata  = 0x012514;
 
 int option_device_number = -1;
diff --git a/src/synthesize.cpp b/src/synthesize.cpp
index 9cda3c8c..37c40787 100755
--- a/src/synthesize.cpp
+++ b/src/synthesize.cpp
@@ -652,11 +652,17 @@ static void SmoothSpect(void)
 			frame = frame2 = (frame_t *)q[2];
 			modified = 0;
 
+			if(frame->frflags & FRFLAG_BREAK)
+				break;
+
 			if(frame->frflags & FRFLAG_FORMANT_RATE)
 				len = (len * 12)/10;      // allow slightly greater rate of change for this frame (was 12/10)
 
 			for(pk=0; pk<6; pk++)
 			{
+				if((frame->frflags & FRFLAG_BREAK_LF) && (pk < 3))
+					continue;
+
 				allowed = (formant_rate[pk] * len)/256;
 
 				diff = frame->ffreq[pk] - frame1->ffreq[pk];
diff --git a/src/synthesize.h b/src/synthesize.h
index 0000776d..b07f1ee5 100755
--- a/src/synthesize.h
+++ b/src/synthesize.h
@@ -31,6 +31,7 @@
 #define FRFLAG_LEN_MOD         0x04   // reduce effect of length adjustment
 #define FRFLAG_BREAK_LF        0x08   // but keep f3 upwards
 #define FRFLAG_BREAK           0x10   // don't merge with next frame
+#define FRFLAG_BREAK_2         0x18   // FRFLAG_BREAK_LF or FRFLAG_BREAK
 #define FRFLAG_FORMANT_RATE    0x20   // Flag5 allow increased rate of change of formant freq
 #define FRFLAG_MODULATE        0x40   // Flag6 modulate amplitude of some cycles to give trill
 #define FRFLAG_DEFER_WAV       0x80   // Flag7 defer mixing WAV until the next frame
diff --git a/src/translate.h b/src/translate.h
index 8cba17dd..762f2445 100755
--- a/src/translate.h
+++ b/src/translate.h
@@ -206,7 +206,7 @@ extern const int param_defaults[N_SPEECH_PARAM];
 
 
 
-#define N_LOPTS      12
+#define N_LOPTS      13
 #define LOPT_DIERESES        1
  // 1=remove [:] from unstressed syllables, 2= remove from unstressed or non-penultimate syllables
  // bit 4=0, if stress < 4,  bit 4=1, if not the highest stress in the word
@@ -235,6 +235,8 @@ extern const int param_defaults[N_SPEECH_PARAM];
  // bit 4=only if the second word has $alt attribute
  // bit 5=not if the second word is end-of-sentence
 #define LOPT_COMBINE_WORDS 11
+ // change [t] when followed by unstressed vowel
+#define LOPT_REDUCE_T 12
 
 
 typedef struct {