diff --git a/dictsource/en_rules b/dictsource/en_rules
index ecad5aeb..bcef1cf5 100644
--- a/dictsource/en_rules
+++ b/dictsource/en_rules
@@ -5036,10 +5036,12 @@
             Eme (_       i:m
             Ensk (_      'Ensk
             En (_        @n
+?8          En (_        En
             En (atA      @n
             E (ndous     E
             Ener (_      _n@
             Ening (_     _nI2N
+?8          Ening (_     EnI2N
             Ene (_       i:n
             Ened (_      @nd
             E (nt_       @
diff --git a/dictsource/fr_list b/dictsource/fr_list
index d241e739..59b7f7c7 100755
--- a/dictsource/fr_list
+++ b/dictsource/fr_list
@@ -5,7 +5,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated 2008-01-25  Michel Such  <michel.such@free.fr>
+// Updated 2008-01-29 Michel Such  <michel.such@free.fr>
 //
 //	* Numbers, a few abbreviations and exceptions.
 //
@@ -135,7 +135,7 @@ _5X	sE~k'A~t
 _51	sE~k'A~te:E~
 _6X	swas'A~t
 _61	swas'A~te:E~
-_7X	swas'A~t:d'is
+_7X	swas'A~t:d'iz3
 _71	swas'A~te:O~z
 _72	swas'A~t:d'uz
 _73	swas'A~t:tR'Ez
@@ -147,7 +147,7 @@ _78	swas'A~t:d'iz'w^it
 _79	swas'A~t:d'izn'@f
 _8X	k'atR@v'E~
 _80	k'atR@v'E~z2
-_9X	k'atR@v'E~d'is
+_9X	k'atR@v'E~d'iz3
 _91	k'atR@v'E~:O~z
 _92	k'atR@v'E~:d'uz
 _93	k'atR@v'E~:tR'Ez
@@ -231,28 +231,28 @@ une	$u $nounf
 
 
 // conjonctions
-mais	$u $brk
+mais	$u
 ou	u $u $brk
 et	e $u $brk
-donc	$u $brk
+donc	$u
 or	$u $brk
-ni	$u $brk
-car	$u $brk
-soit	$u $brk
-cependant  $u $brk
-néanmoins  $u $brk
-toutefois  $u $brk
+ni	$u
+car	$u
+soit	$u
+cependant  $u
+néanmoins  $u
+toutefois  $u
 
 
-comme	   $u $brk
-dont	   dO~t2 $u $brk
-lorsque	   $u $brk
-puisque	   $u $brk
-quand	   $u $brk
-que	   $u $brk
+comme	   $u
+dont	   dO~t2 $u
+lorsque	   $u
+puisque	   $u
+quand	   $u
+que	   $u
 qui	   $u $verbf
-quoique	   $u $brk
-si	   $u $brk
+quoique	   $u
+si	   $u
 
 // pronouns
 je	$u $verbf
@@ -301,19 +301,19 @@ des	dez2 $u $nounf
 au	$u $brk
 aux	$u $brk
 
-dans	$u+ $brk
-sur	$u+ $brk
-par	$u+ $brk
-pour	$u+
-en	$u+
+dans	$u
+sur	$u
+par	$u
+pour	$u
+en	$u
 (en effet) A~nEf'E $brk
 
-vers	$u+ $brk
-avec	$u+ $brk
-sans	$u+ $brk
-sous	$u+ $brk
-entre	$u+ $brk
-contre	$u+ $brk
+vers	$u
+avec	$u
+sans	$u
+sous	$u
+entre	$u $brk
+contre	$u $brk
 
 durant	$brk
 
@@ -370,6 +370,7 @@ consent          kO~s'A~t2
 scient           si
 bénéficient      benefisi $verb
 concurrent       kO~kyR'A~
+content          kO~t@-t2 $verb
 couvent          k'uvt2  $verb
 dessus          d@sy
 dessous          d@su
@@ -399,7 +400,7 @@ torrent           tOR'A~
 
 monsieur         m@sjY
 montréal         mO~Real
-(n'est ce pas)   nEspa
+(n'est ce pas)   n'Es@-||p'az2
 (qu'est ce que)  kEsk@ $u
 (cent un)        s'A~||W~
 (cent unième)    s'A~||ynj'Em
@@ -417,7 +418,7 @@ choeur        k@r
 discident     disidA~
 fils	      fis
 imprudent     E~pRydA~
-juin	      ZuE~
+juin	      ZyE~
 mars	      maRs
 occident      OksidA~
 orient        ORjA~
@@ -552,6 +553,7 @@ outlook         autluk
 player    		plEj'@r
 reader          Ri:d@R
 redhat		REdat
+release	rili:z
 schubert	SubER
 screamer		skri:m@r
 (search & destroy) s@:rS_||end_||dEsstrOj
@@ -571,6 +573,7 @@ word		wWRd
 wright		_^_EN
 writer		rajt@r
 yacht		jot
+yes		jEs $brk
 
 
 // tions (tjO~ instead of sjO~)
diff --git a/dictsource/fr_rules b/dictsource/fr_rules
index dbd13251..468835a3 100755
--- a/dictsource/fr_rules
+++ b/dictsource/fr_rules
@@ -3,7 +3,7 @@
 
 // 2006-11-18  Gilles Casse  <gcasse@oralux.org>
 //
-// Updated: 2008-01-25  Michel Such  <michel.such@free.fr>
+// Updated: 2008-01-29 Michel Such  <michel.such@free.fr>
 //
 //	* The rules are based on Cicero TTS.
 //
@@ -134,7 +134,7 @@
 		el (_       El		// caramel
 		em (me      a		// femme patiemment
 		em (b       A~		// décembre
-		em (m       A~		// emmencher
+		em (m       A~		// emmancher
 		em (p       A~
 		en (_       A~		// en
 		en (hA      A~n		// enharmonique
@@ -170,6 +170,7 @@
 
 	al)	en (t_      A~		// talent équivalent
 	xcell)	en (t_      A~		// excellent
+	nn)	en (t_      t2		// prennent, viennent, sonnent
 
 	mm)	en (t_      A~
 	em)	en (t_      A~		// vitement
@@ -286,11 +287,13 @@
 	_CC) 	e (_        @-
 	_qu) 	e (_        @		// que
 
-	@Cr) 	e (_C       @-		// quatre pattes
 	CC) 	e (_C       @-
-	ch) 	e (_C       @-
+	CC) 	es (_C       @-
+	-j) 	e (_       @-
 	gu) 	e (_C       @-
+	gu) 	es (_C       @-
 	qu) 	e (_C       @-
+	qu) 	es (_C       @-
 
 	 	e (_       		// montre
 
diff --git a/dictsource/zh_rules b/dictsource/zh_rules
index ead89b35..3cdfc1e5 100644
--- a/dictsource/zh_rules
+++ b/dictsource/zh_rules
@@ -62,11 +62,11 @@ language).
        a (DngK	A
 
     y) a	iA
-    y) ao	iAu
-    y) a1o	iAu55
-    y) a2o	iAu35
-    y) a3o	iAu214
-    y) a4o	iAu51
+    y) ao	Au
+    y) a1o	Au55
+    y) a2o	Au35
+    y) a3o	Au214
+    y) a4o	Au51
     y) a (DnK	iE
     y) a (DngK	iA
 
@@ -121,7 +121,7 @@ language).
        ia	iA
        ia (DnK	iE
        ia (DngK	iA
-       iao	iAu
+       iao	jAu
        ie	iE
        io (DngK 	y
        iu 	iou 
@@ -175,9 +175,9 @@ language).
 
 .group u
        u        u
-       ua	uA  //ua uan uang, and uan should be more different from uang
+       ua	wA  //ua uan uang, and uan should be more different from uang
        ua (DnK	ua
-       ua (DngK ua
+       ua (DngK wA
        uai	uai
        ua1i	uai55
        ua2i	uai35
@@ -205,19 +205,19 @@ language).
     n) ve	yE //üe
 
 .group w
-       wa	wuA //wa wan wang
-       wai	wuai
-       wa1i	wuai55
-       wa2i	wuai35
-       wa3i	wuai214
-       wa4i	wuai51
-       wei	wuei
-       we1i	wuei55
-       we2i	wuei35
-       we3i	wuei214
-       we4i	wuei51
+       wa	wA  //wa wan wang
+       wai	wai
+       wa1i	wai55
+       wa2i	wai35
+       wa3i	wai214
+       wa4i	wai51
+       wei	wei
+       we1i	wei55
+       we2i	wei35
+       we3i	wei214
+       we4i	wei51
        we	wu@ //wen weng
-       wo	wuo
+       wo	wo
        wu	wu
 
 .group x
@@ -226,7 +226,7 @@ language).
 .group y
        y	j //before a o e i
        y (u	//NULL before u
-       yo (DngK	y
+       yo (DngK	yu
        y (K     i    // foreign words
 
 .group z
diff --git a/espeak-data/voices/en/en-n b/espeak-data/voices/en/en-n
index 9c692e60..38ccfa55 100755
--- a/espeak-data/voices/en/en-n
+++ b/espeak-data/voices/en/en-n
@@ -7,5 +7,6 @@ phonemes en_n
 
 stressLength 160 150  180 180  220 220  290 290
 
+replace 00 i@3 i@
 replace 03 N n
 
diff --git a/espeak-data/voices/en/en-r b/espeak-data/voices/en/en-r
index 8f42f35f..274edfb7 100755
--- a/espeak-data/voices/en/en-r
+++ b/espeak-data/voices/en/en-r
@@ -8,8 +8,9 @@ phonemes en_us
 dictrules 3 6
 option 12 1       // reduce [t]
 
-stressLength 145 125 170 170 0 0 265 280
+stressLength 145 125 170 170 0 0 270 290
 stressAmp  17 16  20 20  20 22  23 20
 
 //replace 03 I  i
 //replace 03 I2 i
+
diff --git a/espeak-data/voices/en/en-rp b/espeak-data/voices/en/en-rp
index 0a821682..3489f28a 100755
--- a/espeak-data/voices/en/en-rp
+++ b/espeak-data/voices/en/en-rp
@@ -5,6 +5,7 @@ gender male
 
 phonemes en_rp
 replace 00  o@  O@
+replace 00 i@3 i@
 replace 03 I i
 replace 03 I2 i
 replace 03 @ a2
diff --git a/espeak-data/voices/en/en-wi b/espeak-data/voices/en/en-wi
index 54d06f1c..56a38a38 100755
--- a/espeak-data/voices/en/en-wi
+++ b/espeak-data/voices/en/en-wi
@@ -10,6 +10,7 @@ stressLength 175 175  175 175  220 220  250 290
 replace 00 D d
 replace 00 T t[
 replace 00 U@ o@
+replace 00 i@3 i@
 replace 03 @ a2
 replace 03 3 a2
 
diff --git a/espeak-data/voices/en/en-wm b/espeak-data/voices/en/en-wm
index 86d07fdd..aa82f88f 100755
--- a/espeak-data/voices/en/en-wm
+++ b/espeak-data/voices/en/en-wm
@@ -6,4 +6,7 @@ phonemes en_wm
 
 replace 00 h NULL
 replace 00 o@ O@
+replace 00 i@3 i@
 dictrules 6
+intonation 4
+stressAdd 0 0 0 0 0 0 0 20
diff --git a/espeak-data/voices/la b/espeak-data/voices/la
index b1bc5fe1..f3e97b52 100644
--- a/espeak-data/voices/la
+++ b/espeak-data/voices/la
@@ -6,5 +6,8 @@ stressrule 2 33 0 2
 // flags=0100001 (no automatic secondary stress + don't stres monosyllables)
 // unstressed_wd1=0
 // unstressed_wd2=2
-charset ISO-8859-4
 
+// short gap between words
+words 2
+
+// Note: The Latin voice needs long vowels to be marked with macrons
diff --git a/phsource/compile_report b/phsource/compile_report
index 74141ae8..973eb0dd 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -41,7 +41,7 @@
       is  32  123
       vi  42  136
      zhy  40  131
-      zh  61  145
+      zh  62  146
       sw  14  107
       th  50  141
       id  14  119
@@ -403,7 +403,6 @@ n/_n            [n] base
                 [n] zh
 n/n_            [n] base
                 [n;] ro
-                [n] zh
 n/n@            [(@)] base
 n/n#_           [n#] is
 n^/n^a          [(a)] base
@@ -419,6 +418,7 @@ n/nj            [n] base
                 [n.] base
                 [n^] base
                 [n;] ro
+n/n_long_       [n] zh
 nn/_nn          [N] base
                 [N] en
                 [N] zh
@@ -452,7 +452,8 @@ r3/r_           [r/] base
                 [r/] fr
                 [r/] ru
 r3/r_@          [(@)] base
-r3/r#_          [r#] is
+r3/r#_          [r/] fr
+                [r#] is
 r3/r_a          [(a)] base
 r3/r_e          [(e)] base
 r3/r_i          [(i)] base
@@ -531,6 +532,7 @@ r/ru            [(u)] base
 r/tr            [r] base
                 [r] en_sc
                 [r] fr
+                [r/] fr
                 [R] pt_pt
 r/trr           [r/] base
                 [r/] af
@@ -805,13 +807,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.wav  [tS;] sr
                 [dZ;] sr
 ustop/ts_unasp  [ts] zh
-ustop/t_unasp   [t] zh
-                [t] th
+ustop/t_unasp   [t] th
 vdiph/0i        [OI] pt
                 [OI] grc
                 [OI] vi
@@ -825,6 +827,7 @@ vdiph2/e@       [3:] en_sc
 vdiph2/ea       [ea] ro
 vdiph2/ei_3     [i:] en_wm
 vdiph2/ei_4     [eI] en_us
+                [ei] zh
 vdiph2/eo       [eo] ro
 vdiph2/e[u      [e[u] ro
 vdiph2/i@       [i@] en_n
@@ -833,6 +836,7 @@ vdiph2/ie       [i@] en_wi
                 [ie] fi
                 [ia] th
                 [i:a] th
+vdiph2/ie_2     [iE] zh
 vdiph2/ii@      [i@] en
                 [i@3] en
 vdiph2/ii@_3    [i@] vi
@@ -852,6 +856,7 @@ vdiph2/oa       [Oa] ro
                 [ua] zh
 vdiph2/o_oo     [o@] en_wi
                 [o] is
+                [o] zh
 vdiph2/u-@      [y@] vi
                 [y:a] th
 vdiph2/u#@      [U@] en_sc
@@ -865,7 +870,7 @@ vdiph2/uu@      [U@] en
 vdiph2/y#@      [Y@] af
                 [y@] zh
 vdiph2/yu       [yU] nl
-                [y] zh
+                [yu] zh
 vdiph2/y-y#     [yY] fi
 vdiph/8u        [oU] en_us
                 [ou] zh
@@ -884,7 +889,6 @@ vdiph/aau_3     [aU] hi
 vdiph/aau_4     [aU] vi
 vdiph/ae        [E:] fr_ca
                 [aI] la
-                [ai] zh
 vdiph/ae_2      [aI] en_n
 vdiph/ai        [aI] base2
                 [aI] en_wi
@@ -903,6 +907,7 @@ vdiph/ai_3      [aI] no
 vdiph/ai_4      [aI] af
 vdiph/ai_5      [aI] de
 vdiph/ai_6      [aI] en_rp
+                [ai] zh
 vdiph/ai_7      [aI] en_sc
                 [aI2] en_sc
                 [aI] is
@@ -951,7 +956,6 @@ vdiph/ei        [eI] base2
                 [eI] is
                 [eI] vi
                 [ei] zhy
-                [ei] zh
 vdiph/eu        [eU] base2
                 [eU] en
                 [eU] cy
@@ -1061,7 +1065,7 @@ vnasal/oi_n     [oI~] pt
 vnasal/o_n      [o~] hi
                 [o~] pt
 vnasal/o_n2     [o~] af
-vnasal/o_n3     [O~] fr
+                [O~] fr
 vnasal/oo_n     [O~] en
 vnasal/oo_n2    [O~] hi
                 [O~] pl
@@ -1185,6 +1189,7 @@ vowel/3_en      [3:] en
                 [@:] th
 vowel/@_4       [@] nl
                 [@] no
+vowel/8         [o-] zh
 vowel/8_2       [U] en_us
                 [8] sv
 vowel/8_3       [eo] zhy
@@ -1427,6 +1432,7 @@ vowel/i_6       [i:] en_us
                 [i] ta
                 [i] hr
                 [i] id
+vowel/i#_7      [i[] zh
 vowel/i_en      [i:] en
                 [i:] fr
                 [i] vi
@@ -1462,6 +1468,7 @@ vowel/ii_4      [I] en
 vowel/ii_5      [I] en_wi
                 [I2] en_wi
                 [I] la
+                [i] zh
 vowel/ii_6      [I] en_wm
                 [I2] en_wm
                 [I] sr
@@ -1490,12 +1497,9 @@ vowel/o         [o] base2
                 [o] pt_pt
                 [o] grc
                 [o:] sv
-                [o] zh
-                [u] zh
                 [o] th
                 [o:] th
                 [o] id
-vowel/o-        [o-] zh
 vowel/o_2       [o:] cy
                 [o:] hi
                 [o:] hu
@@ -1510,6 +1514,7 @@ vowel/o_4       [oU] en_n
 vowel/o-_4      [o] ro
 vowel/o_5       [O] nl
 vowel/o_6       [O:] nl
+vowel/o_7       [u] zh
 vowel/oe        [W] en
                 [W] af
                 [W] de
@@ -1583,7 +1588,6 @@ vowel/u         [u:] en_wi
                 [u:] ta
                 [u:] cs
                 [U] la
-                [u] zh
                 [u] th
                 [u:] th
                 [u] id
@@ -1622,6 +1626,7 @@ vowel/u_bck     [u] base2
                 [u:] no
                 [u] is
                 [u] zhy
+                [u] zh
 vowel/u_bck2    [u:] la
 vowel/u_fnt     [u:] en_rp
 vowel/uu        [U] en
@@ -1659,7 +1664,6 @@ vowel/y         [y:] en
                 [y] nl
                 [y] la
                 [yu] zhy
-                [y] zh
 vowel/y#        [Y:] en
                 [3:] en_wm
                 [Y:] de
@@ -1674,6 +1678,7 @@ vowel/y##       [y#] is
 vowel/y_2       [y] fr
                 [y"] fr
                 [y:] la
+                [y] zh
 vowel/y#_2      [Y] hu
                 [Y:] sv
 vowel/y_3       [y] af
@@ -1738,7 +1743,7 @@ vwl_en_us/er    [e@] en_us
 vwl_en_us/ii    [I] en_us
                 [I2] en_us
 vwl_en_us/ir    [i@3] en_us
-                [i@] en_sc
+                [i@3] en_sc
 vwl_en_us/oor   [O@] en_us
 vwl_en_us/or    [O:] en_us
                 [o@] en_us
@@ -1794,8 +1799,6 @@ vwl_zh/ang      [ang] zhy
 vwl_zh/eng      [eng] zhy
 vwl_zh/iaa      [iA] zh
 vwl_zh/iaau     [iAu] zh
-vwl_zh/i_dnt    [i[] zh
-vwl_zh/iee      [iE] zh
 vwl_zh/ing      [ing] zhy
 vwl_zh/iou      [iou] zh
 vwl_zh/i_rfx    [i.] zh
@@ -1822,6 +1825,7 @@ w/w2            [w2] base2
                 [w] pt_pt
 w/wa            [(a)] base
 w/we            [(e)] base
+                [w] fr
 w/wi            [(i)] base
                 [i] vi
                 [i] zhy
diff --git a/phsource/ph_english_sc b/phsource/ph_english_sc
index dd167c56..e31f3d8d 100644
--- a/phsource/ph_english_sc
+++ b/phsource/ph_english_sc
@@ -274,11 +274,10 @@ phoneme e@
 endphoneme
 
 
-phoneme i@
+phoneme i@3
   vowel  starttype (i)  endtype (@)
   length 220
   formants vwl_en_us/ir
-//  formants vdiph2/i@_2
   appendph r
 endphoneme
 
diff --git a/phsource/ph_english_wi b/phsource/ph_english_wi
index f657e7bc..ad319a41 100644
--- a/phsource/ph_english_wi
+++ b/phsource/ph_english_wi
@@ -62,7 +62,7 @@ endphoneme
 
 
 phoneme 0
-  vowel  starttype (o)   endtype (o)
+  vowel  starttype (a)   endtype (a)
   length 140
   formants vowel/aa#
 endphoneme
@@ -115,7 +115,7 @@ endphoneme
 
 
 phoneme 3:
-  vowel  starttype (@)  endtype (@)
+  vowel  starttype (o)  endtype (o)
   length 240
   formants vowel/oo_4
   linkout r-
diff --git a/phsource/ph_english_wm b/phsource/ph_english_wm
index 3799c6c7..9e243339 100644
--- a/phsource/ph_english_wm
+++ b/phsource/ph_english_wm
@@ -189,7 +189,7 @@ endphoneme
 
 phoneme eI
   vowel  starttype (@)  endtype (i)
-  length 230
+  length 240
   formants vdiph/@i_3
 endphoneme
 
@@ -202,7 +202,7 @@ endphoneme
 
 
 phoneme e@
-  vowel  starttype (e)  endtype (@)
+  vowel  starttype (@)  endtype (@)
   length 240
   formants vowel/3_en
   linkout r-
diff --git a/phsource/ph_french b/phsource/ph_french
index 0126481b..52d8a568 100644
--- a/phsource/ph_french
+++ b/phsource/ph_french
@@ -93,10 +93,11 @@ endphoneme
 phoneme w
   liquid
   unstressed
-  length 100
+  length 120
   beforenotvowel w/
   lengthmod 7
   formants w/w
+  before (e) w/we
   after _ w/_w
 endphoneme
 
@@ -134,7 +135,7 @@ endphoneme
 phoneme O~
   vowel  starttype (o)  endtype (o)
   length 180
-  formants vnasal/o_n3
+  formants vnasal/o_n2
 endphoneme
 
 
@@ -281,7 +282,7 @@ endphoneme
 
 
 phoneme r
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   vowelin f1=0  f2=800 -100 100  f3=-400 100
   vowelout f1=0  f2=800 -100 100  f3=-400 100 len=0 rms=20
   length 100
@@ -294,7 +295,7 @@ endphoneme
 
 
 phoneme R
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   vowelin f1=0  f2=800 -100 100  f3=-400 100
   length 100
   lengthmod 7
@@ -305,11 +306,13 @@ endphoneme
 
 
 phoneme r/   // used for [r] when not preceding a vowel
-  vcd uvl frc
+  vcd uvl frc starttype r endtype r
   length 100
   lengthmod 2   //
-  formants r3/r_+r3/rx%60
+  formants r3/r#_+r3/rx%60
+  after t  r/tr%60
   before n   r3/r_n+r3/rx%60
+  before _ r3/r_%60
 endphoneme
 
 
@@ -405,3 +408,4 @@ phoneme z3      // "six" and "dix". [s] before pause, [z] before vowel, else []
   lengthmod 6
 endphoneme
 
+
diff --git a/phsource/ph_zh b/phsource/ph_zh
index 7a766a4b..78d813f6 100644
--- a/phsource/ph_zh
+++ b/phsource/ph_zh
@@ -50,7 +50,7 @@ endphoneme
 
 phoneme 55   //  tone: high level
   stress
-  tone 50 50 envelope/p_level NULL
+  tone 55 50 envelope/p_level NULL
 endphoneme
 
 //====================================================
@@ -92,7 +92,7 @@ phoneme t
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave  ustop/t_unasp
+  wave  ustop/t_sr%10
 endphoneme
 
 phoneme th
@@ -106,10 +106,9 @@ endphoneme
 phoneme n
   vcd alv nasal
   vowelout f1=2 f2=1700 -300 250  f3=-100 80  rms=20 brk
-  length 30
   lengthmod 2
   formants n/_n
-  before _ n/n_
+  before _ n/n_long_
   before (i) n/ni
 endphoneme
 
@@ -163,7 +162,7 @@ phoneme ts
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave ustop/ts_unasp
+  wave ustop/ts_unasp%50
 endphoneme
 
 phoneme tsh
@@ -171,7 +170,7 @@ phoneme tsh
   vowelin f1=0  f2=1700 -300 300  f3=-100 80
   vowelout f1=0 f2=1700 -300 250  f3=-100 80  rms=20
   lengthmod 2
-  wave ustop/ts
+  wave ustop/ts%60
 endphoneme
 
 phoneme ts.
@@ -213,7 +212,7 @@ endphoneme
 
 phoneme N //should be more different from n
   vcd vel nasal
-  length 10
+  vowelout f1=3 f2=2300 300 400  f3=-200 80  len=40 rms=20 brk
   formants NULL
   before _ nn/nn_
   after _ nn/_nn
@@ -237,7 +236,7 @@ endphoneme
 phoneme ai
   vowel starttype (a) endtype (i)
   length 250
-  formants vdiph/ae
+  formants vdiph/ai_6
 endphoneme
 
 phoneme Au
@@ -248,7 +247,7 @@ endphoneme
 
 phoneme @
   vowel  starttype (@)  endtype (@)
-  length 230
+  length 200
   formants vowel/3_2%120
   before N vowel/@_bck
 endphoneme
@@ -268,7 +267,7 @@ endphoneme
 phoneme ei
   vowel starttype (e) endtype (i)
   length 250
-  formants vdiph/ei
+  formants vdiph2/ei_4
 endphoneme
 
 phoneme i
@@ -276,12 +275,13 @@ phoneme i
   length 250
   formants vowel/i
   before N vowel/ii_2
+  before n vowel/ii_5
 endphoneme
 
 phoneme i[ //after ts tsh s
   vowel  starttype (i)  endtype (i)
   length 250
-  formants vwl_zh/i_dnt
+  formants vowel/i#_7
 endphoneme
 
 phoneme i. //after ts. ts.h s. z.
@@ -305,7 +305,7 @@ endphoneme
 phoneme iE
   vowel  starttype (i)  endtype (e)
   length 250
-  formants vwl_zh/iee
+  formants vdiph2/ie_2
 endphoneme
 
 phoneme io
@@ -323,13 +323,13 @@ endphoneme
 phoneme o
   vowel starttype (o) endtype (o)
   length 250
-  formants vowel/o
+  formants vdiph2/o_oo
 endphoneme
 
 phoneme o-
   vowel  starttype (o)  endtype (o)
   length 250
-  formants vowel/o-
+  formants vowel/8
 endphoneme
 
 phoneme ou
@@ -341,8 +341,8 @@ endphoneme
 phoneme u //try more before N
   vowel starttype (u) endtype (u)
   length 250
-  formants vowel/u
-  before N vowel/o
+  formants vowel/u_bck
+  before N vowel/o_7
 endphoneme
 
 phoneme uA
@@ -377,15 +377,20 @@ endphoneme
 
 phoneme uo
   vowel starttype (u) endtype (o)
-  length 250
+  length 280
   formants vwl_zh/uo
 endphoneme
 
-phoneme y  //try more before N
+phoneme y
+  vowel  starttype (i)  endtype (i)
+  length 250
+  formants vowel/y_2
+endphoneme
+
+phoneme yu  //try more before N
   vowel  starttype (i)  endtype (u)
   length 250
-  formants vowel/y
-  before N vdiph2/yu
+  formants vdiph2/yu
 endphoneme
 
 phoneme y&
diff --git a/phsource/phonemes b/phsource/phonemes
index 9e453b25..81e584f1 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -592,16 +592,14 @@ phoneme N
   lengthmod 8            // longer than 'n'
 endphoneme
 
-phoneme **    //   TEST flap after consonant
+phoneme **    //   TEST flap
   liquid alv
   vowelout f1=3 f2=1600 -300 300  f3=-300 80 rms=35 len=15
-  vowelin f1=0  f2=1600 -300 300  f3=-300 80
-  formants r3/@tap+r3/rx
+  vowelin f1=2  f2=1600 -300 300  f3=-300 80
+  formants r3/@tap+r3/rx%50
   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=2  f2=1600 -300 300  f3=-300 80
-  before (a) r3/@tap+r3/rx
 endphoneme
 
 
diff --git a/phsource/r3/@tap b/phsource/r3/@tap
index 480db11f..24ad2967 100644
Binary files a/phsource/r3/@tap and b/phsource/r3/@tap differ
diff --git a/phsource/ustop/ts_unasp.wav b/phsource/ustop/ts_unasp.wav
index 1dafbcaa..c86de181 100644
Binary files a/phsource/ustop/ts_unasp.wav and b/phsource/ustop/ts_unasp.wav differ
diff --git a/phsource/vdiph/aau_2 b/phsource/vdiph/aau_2
index 4c7e820b..a2a9ed7f 100644
Binary files a/phsource/vdiph/aau_2 and b/phsource/vdiph/aau_2 differ
diff --git a/phsource/vdiph/vowelchart.png b/phsource/vdiph/vowelchart.png
index 9fa880c8..66b93597 100644
Binary files a/phsource/vdiph/vowelchart.png and b/phsource/vdiph/vowelchart.png differ
diff --git a/phsource/vdiph2/ei_4 b/phsource/vdiph2/ei_4
index 300d02f9..3a74f3e4 100644
Binary files a/phsource/vdiph2/ei_4 and b/phsource/vdiph2/ei_4 differ
diff --git a/phsource/vdiph2/ie_2 b/phsource/vdiph2/ie_2
new file mode 100644
index 00000000..e30350a1
Binary files /dev/null and b/phsource/vdiph2/ie_2 differ
diff --git a/phsource/vdiph2/o_oo b/phsource/vdiph2/o_oo
index 958cf540..818cf8cb 100644
Binary files a/phsource/vdiph2/o_oo and b/phsource/vdiph2/o_oo differ
diff --git a/phsource/vdiph2/vowelchart.png b/phsource/vdiph2/vowelchart.png
index 9d8f3e12..3bdf2945 100644
Binary files a/phsource/vdiph2/vowelchart.png and b/phsource/vdiph2/vowelchart.png differ
diff --git a/phsource/vdiph2/yu b/phsource/vdiph2/yu
index 0e477350..af104978 100644
Binary files a/phsource/vdiph2/yu and b/phsource/vdiph2/yu differ
diff --git a/phsource/vowel/3_2 b/phsource/vowel/3_2
index 9f07c526..15e5b581 100644
Binary files a/phsource/vowel/3_2 and b/phsource/vowel/3_2 differ
diff --git a/phsource/vowel/8 b/phsource/vowel/8
index a8408912..8e254fa0 100644
Binary files a/phsource/vowel/8 and b/phsource/vowel/8 differ
diff --git a/phsource/vowel/i#_7 b/phsource/vowel/i#_7
new file mode 100644
index 00000000..9b58f779
Binary files /dev/null and b/phsource/vowel/i#_7 differ
diff --git a/phsource/vowel/o_7 b/phsource/vowel/o_7
new file mode 100644
index 00000000..55c38fd4
Binary files /dev/null and b/phsource/vowel/o_7 differ
diff --git a/phsource/vowel/u#_6 b/phsource/vowel/u#_6
new file mode 100644
index 00000000..b174630a
Binary files /dev/null and b/phsource/vowel/u#_6 differ
diff --git a/phsource/vowel/vowelchart.png b/phsource/vowel/vowelchart.png
index f959bf7a..4255a138 100644
Binary files a/phsource/vowel/vowelchart.png and b/phsource/vowel/vowelchart.png differ
diff --git a/phsource/vwl_zh/aau b/phsource/vwl_zh/aau
index 7afb410a..d62ad577 100644
Binary files a/phsource/vwl_zh/aau and b/phsource/vwl_zh/aau differ
diff --git a/phsource/vwl_zh/i_rfx b/phsource/vwl_zh/i_rfx
index ab177dc6..90eaf542 100644
Binary files a/phsource/vwl_zh/i_rfx and b/phsource/vwl_zh/i_rfx differ
diff --git a/phsource/vwl_zh/iaa b/phsource/vwl_zh/iaa
index 7fc758bb..a475ffd1 100644
Binary files a/phsource/vwl_zh/iaa and b/phsource/vwl_zh/iaa differ
diff --git a/phsource/vwl_zh/iee b/phsource/vwl_zh/iee
index 886e0fa9..ae1541e5 100644
Binary files a/phsource/vwl_zh/iee and b/phsource/vwl_zh/iee differ
diff --git a/phsource/vwl_zh/uo b/phsource/vwl_zh/uo
index 704b1035..5b260432 100644
Binary files a/phsource/vwl_zh/uo and b/phsource/vwl_zh/uo differ
diff --git a/phsource/vwl_zh/y& b/phsource/vwl_zh/y&
index 0b94f41d..4819901b 100644
Binary files a/phsource/vwl_zh/y& and b/phsource/vwl_zh/y& differ
diff --git a/phsource/vwl_zh/yee b/phsource/vwl_zh/yee
index 47babdc7..0809ee49 100644
Binary files a/phsource/vwl_zh/yee and b/phsource/vwl_zh/yee differ
diff --git a/src/intonation.cpp b/src/intonation.cpp
index 83335052..e4a259f9 100755
--- a/src/intonation.cpp
+++ b/src/intonation.cpp
@@ -308,7 +308,7 @@ static TONE_TABLE tone_table[N_TONE_TABLE] = {
    20, 25,   32, 24,  drops_0, 4, 3,   5, oflow_less, NULL, 14, 8, 0},
 
    {PITCHrise, 30, 20,  PITCHfall, 19, 14,              // 8 pitch raises at end of sentence
-   20, 25,   34, 22,  drops_0, 3, 3,   5, oflow, NULL, 24, 30, 0},
+   20, 25,   34, 22,  drops_0, 3, 3,   5, oflow, NULL, 20, 26, 0},
 
    {PITCHfrise, 35,11, PITCHfrise2, 32,10,              // 9 comma
    20, 25,   34, 20,  drops_0, 3, 3,   5, oflow, NULL, 19, 24, 0},
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index e13ba811..08722858 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.03  26.Jan.08";
+const char *version_string = "1.31.04  30.Jan.08";
 const int version_phdata  = 0x013100;
 
 int option_device_number = -1;
@@ -426,7 +426,7 @@ frameref_t *LookupSpect(PHONEME_TAB *this_ph, PHONEME_TAB *prev_ph, PHONEME_TAB
 		{
 			// lookup formant transition for the following phoneme
 
-			if(*match_level == 0)
+			if((*match_level == 0) || (next_ph->type == phNASAL))
 			{
 				LookupSound(next_ph,this_ph,1,NULL,1);
 				seq_len_adjust += FormantTransition2(frames,nf,vowel_transition[2],vowel_transition[3],next_ph,which);