diff --git a/dictsource/dict_phonemes b/dictsource/dict_phonemes
index e0cb0512..141ff973 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   ts   
-v    w    x2   z    Z    
+p    r    r-   s    S    t    tS   v    
+w    x2   z    Z    
 
 
 Dictionary cs_dict
@@ -110,7 +110,7 @@ yi   Yy   yY
 
 *    :    b    d    f    g    h    j    
 k    l    m    n    N    p    r    s    
-S    s2   t    ts   v    Z    
+S    s2   t    v    Z    
 
 
 Dictionary fr_dict
@@ -122,7 +122,7 @@ y    Y
 :    ;    b    c    d    dZ   f    g    
 h    j    k    l    L    m    n    N    
 n^   p    R    s    S    t    t2   tS   
-ts   v    w    z    Z    z2   
+v    w    z    Z    z2   
 
 
 Dictionary hi_dict
@@ -142,8 +142,9 @@ t.h  th   v    w    x    z
 Dictionary hr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   i    I    i:   l-   
-o    o:   oU   r-   u    U    u:   y    
+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^   
@@ -182,7 +183,7 @@ y    Y:   yU
 *    :    ;    b    C    d    f    g    
 h    j    k    l    m    n    N    n^   
 p    Q    r    s    S    s;   t    tS   
-ts   v    v2   w    x    z    
+v    v2   w    x    z    
 
 
 Dictionary no_dict
@@ -321,7 +322,7 @@ y    y#   Yy
 f    g    h    j    J    k    l    l#   
 m    m#   n    N    n#   N#   n^   n^#  
 p    Q    r    R    r#   R2   s    S    
-t    T    tl#  ts   v    x    z    
+t    T    tl#  v    x    z    
 
 
 Dictionary la_dict
@@ -338,8 +339,9 @@ r    R    s    t    w    z
 Dictionary sr_dict
 
 &    @    @-   @2   a    A    a:   aI   
-aU   E    e    e:   i    I    i:   l-   
-o    o:   oU   r-   u    U    u:   y    
+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^   
@@ -349,9 +351,11 @@ tS;  v    x    z    Z
 
 Dictionary mk_dict
 
-@-   a    E    i    l-   O    r-   u    
+&    @    @-   @2   a    A    a:   E    
+e    e:   E~   i    I    i:   l-   o    
+o:   oU   r-   u    u:   y    
 
-*    b    c    d    dZ   f    g    h    
-j    J    k    l    l^   m    n    n^   
-p    R    s    S    t    tS   ts   v    
-z    Z    
+*    b    d    dZ   dZ;  f    g    h    
+j    k    k^   l    l^   m    n    N    
+n^   p    r    R    s    S    t    tS   
+ts   tS;  v    x    z    Z    
diff --git a/dictsource/fr_list b/dictsource/fr_list
index bab450e0..bc8d0b4e 100755
--- a/dictsource/fr_list
+++ b/dictsource/fr_list
@@ -39,12 +39,12 @@ $	dOlaR
 %	puRsA~
 &	_e
 +	plys
-~	tild'e
-€	@R'o
+~	tilde
+€	@Ro
 ¢	sEnt
-¥	i;'En
-£	l'ivR
-°	d@gR'e
+¥	i;En
+£	livR
+°	d@gRe
 ±	pl'yz_'u_mw'E~
 ×	myltip@-lj'e_p'aR
 ÷	diviz'e_p'aR
@@ -59,30 +59,30 @@ $	dOlaR
 _?A  lEt@
 _??  sE~b'OL
 
-_"   gijm'E
-_#   dj'Ez
-_'   apOstR'Of
+_"   gijmE
+_#   djEz
+_'   apOstROf
 _(   'uvR@-paRA~t'Ez
 _)   f'ERm paRA~t'Ez
 _*   astERisk:
-_,   viRg'yl
-_-   tiR'E
-_.   pw'E~
-_/   sl'aS
+_,   viRgyl
+_-   tiRE
+_.   pwE~
+_/   slaS
 _:   d'Ypw'E~
 _;   pw'E~viRg'yl
-_<   E~feRj'WR
-_=   eg'al
-_>   sypeRj'WR
-_?   kEstj'O~
-_[   uvR@-_kRoS'E
+_<   E~feRjWR
+_=   egal
+_>   sypeRjWR
+_?   kEstjO~
+_[   uvR@-_kRoSE
 _\   b'aksl'aS
 _]   f'ERm_kRoS'E
-_^   siRkOnfl'Eks
-__   sulin^'e
+_^   siRkOnflEks
+__   sulin^e
 _`   aks'A~_gR'av
-_{   uvR_akOl'ad
-_|   b'aR
+_{   uvR_akOlad
+_|   baR
 _}   f'ERm_akOl'ad
 
 
@@ -165,42 +165,42 @@ _dpt	pw'E~
 //**************
 
 (http ://)	aSt,et,ep'e
-abc		'a b'e s'e
-ac		'a s'e
-api		'a p'e 'i
-cio		s'e'i;'o
-ctrl		kO~tR'ol
-dept		depaRt@m'A~
-etc		etseteR'a
+abc		$abbrev
+ac		$abbrev
+api		$abbrev
+cio		$abbrev
+ctrl		kO~tRol
+dept		depaRt@mA~
+etc		etseteRa
 hmm		h@m
-ibm		'i:b'e:'Em
-ip		'i:p'e
-kde		kade@
-m.		m@sj'Y
+ibm		$abbrev
+ip		$abbrev
+kde		$abbrev
+m.		m@sjY
 mbrola		Em'bRola
-mlle		mad@mwaz'El
-mme		mad'am
-mr		m@sj'Y
-p.s		pOftkRipt'Om
-ratp		'ER:'a:t'e:p'e
+mlle		mad@mwazEl
+mme		madam
+mr		m@sjY
+p.s		postskRiptOm
+ratp		$abbrev
 s.t.p		s'il:t'@:pl'E
 s.v.p		s'il:v'u:pl'E
 st		s'E~
 ste		s'E~t
 stp		s'il:t'@:pl'E
 svp		s'il:v'u:pl'E
-url		'y:'ER:'El
-usb		'y:'Es:'be
-utf		y:te:Ef
+url		$abbrev
+usb		$abbrev
+utf		$abbrev
 xfce		iksEfse@
-xy		'iks:igR'Ek
+xy		$abbrev
 
 ii               d'Y          $abbrev    // roman numerals
 iii              tRw'a        $abbrev
 iv               k'atR        $abbrev
 
 
-dr               dOkt'WR       $dot $capital
+dr               dOkt WR       $dot $capital
 prof                           $dot
 
 
@@ -411,11 +411,9 @@ imprudent     E~pRydA~
 discident     disidA~
 accident      aksidA~
 occident      OksidA~
-l'occident    lOksidA~
 orient        ORjA~
-l'orient      lORjA~
 secret        sYkRE
-secrets       sYkRE
+secrets       sYkREz2
 
 
 sens	      sA~s
@@ -433,7 +431,7 @@ l'écho          leko
 cci              $abbrev
 espeak          ispik
 nvda             $abbrev
-open            Op'@n
+open            Op'En
 outlook         autluk
 potentiomètre   pOtA~sjOmEtR
 reader          Rid'WR
@@ -512,7 +510,7 @@ smart		smaRt
 // irt
 flirt		fl@Rt
 (sweat shirt)	swEtS@Rt
-tee-shirt	tiS@Rt
+(tee shirt)	tiS@Rt
 
 parfum		paRfW~
 forum		fOR@m
@@ -610,6 +608,6 @@ votions		vOtjO~z2 $u
 
 // no liaison
 (quelqu'un)	kElkW~
-pourcent	puRs'A~
+pourcent	puRsA~
 vincent		vE~sA~
 
diff --git a/dictsource/fr_rules b/dictsource/fr_rules
index 9516d1df..be096e70 100755
--- a/dictsource/fr_rules
+++ b/dictsource/fr_rules
@@ -435,6 +435,7 @@
 	_)	l (_        El
 		l           l		// lit
 		ll          l		// aller	
+	_)	l' (P2      l
 	au)	lt			// hérault
 	outi)	l (_ 			// outil
 	ui)	ll          j		// juillet
diff --git a/dictsource/mk_list b/dictsource/mk_list
new file mode 100755
index 00000000..e35e3524
--- /dev/null
+++ b/dictsource/mk_list
@@ -0,0 +1,272 @@
+ // translation rules for Macedonian
+// This file is UTF-8 encoded
+// Letters
+
+б     b@
+в     v@
+г     g@
+д     d@
+ѓ     dZ;@
+ж     Z@
+з     z@
+ѕ     dz@
+ј     j@2
+к     k@
+л     l@
+љ     l^@
+м     m@
+н     n@
+њ     n^@
+п     p@
+р     R@
+с     s@
+т     t@
+ќ     k^@
+ф     f@
+х     x@
+ц     ts@
+ч     tS@
+џ     dZ@
+ш     S@
+
+q     kv@
+w     dvost@-*uko||v@
+x     iks
+z     z@
+
+
+ // translation rules for Croatian
+// This file is UTF-8 encoded
+
+
+
+_??   znak          // unknown symbol
+_?A   bukva         // unknown letter
+©     'avtoRsk&||p@-*av&
+%     p'osto
++     plus
+€     'evRo
+@     _'et
+&     _'i
+!     'izvItSnIk
+:     dve_totSki
+#     b@-*'oj_
+/     k@-*'oz_
+\\    b'EkslES
+^     ts'irkumfleks
+~     t'ild&
+¤     v'alut&
+§     del
+µ     m'ik@-*o
+¶     tSlen
+°     st'epen
+_"    n'avodnIk
+_‚    'otvoRen||n'avodnIk
+_„    zatvoRen||n'avodnIk
+…     t@-*'i||t'otSki
+†     k@-*st
+‡     dv'oen||k@-*'st
+‰     p@-*'omil
+_‹    'otvoRen||n'avodnIk
+_‘    'otvoRen||n'avodnIk
+_’    'edinetSen||n'avodnIk
+_“    'otvoRen||n'avodnIk
+_”    z'atvoRen||n'avodnIk
+•     g'olema||t'otSk&
+_–    En||ts'r-t&
+_—    Em||ts'r-t&
+™     p@-*oizv'oditel
+˘     b@-*'evis
+¨     p@-*'ijegl&s
+_«    'otvoRen||n'avodnIk
+_­    p@-*'iv@-*emen&||ts'r-t'itSk&
+·     po
+¸     sed'il&
+_»    z'atvoRen||n'avodnIk
+®     R'egist@-*atsIj&
+ł     l@||s&||ts'r-t'itsom
+×     p'o
+÷     pod'el^,eno
+
+_$    d'ol&R
+_-    m'inus
+_*    dzv'ezditSk@
+_=    'edn&kvo
+_@    t'r-g'ovsko||'a
+_(    'otvoRen&||z'ag@-*ad&
+_)    z'atvoRen&||z'ag@-*ad&
+_'    'apost@-*of
+_*    dzv'ezditSk&
+_,    z'apiRk&
+_-    ts'r-t'itSk&
+_.    t'otSk&
+_;    t'otSk&z,apiRka
+_<    p'omalo||'od
+_=    'edn&kvo
+_>    pog'olemo||'od
+_?    pr'aSalnik
+_&    t'r-g'ovsko||'i
+_[    'otvoRen&||sR'edn&||z'ag@-*ad&
+_]    z'atvoRen&||sR'edn&||z'ag@-*ad&
+__    ts'r-t&
+_`    g@-*'avis
+_{    'otvoRen&||g'olem&||z'ag@-*ad&
+_|    veRtikaln&||ts'r-t&
+_}    z'atvoRen&||g'olema&||z'ag@-*ad&
+
+
+
+
+// Numbers
+_0    n'ul&
+_1    'eden
+_1f    'edna
+_2    d'v'a
+_2f   dv'e
+_3    tR'i
+_4    tS'EtI*I
+_5    p'Et
+_6    S'Est
+_7    s'Edum
+_8    'osum
+_9    d'EvEt
+_10   d'EsEt
+_11   edIn'aeset
+_12   dvan'aeset
+_13   t@-*in'aeset
+_14   tSEtirin'aeset
+_15   pEtn'aeset
+_16   SEsn'aeset
+_17   sEdumn'aeset
+_18   osumn'aeset
+_19   dEvEtn'aeset
+_2X   dv'aEsEt
+_3X   t@-*'iEsEt
+_4X   tSEtir-'iEsEt
+_5X   p'EEsEt
+_6X   S'EEsEt
+_7X   sEd'umdEsEt
+_8X   os'umdEsEt
+_9X   dEv'EEsEt
+_0C   st'o_
+_2C   dv'est'a
+_6C   S'Est'o
+_0M1  'iljadi
+_1MA1 'iljad&
+_0M2  mili'oni
+_1MA2 mili'on
+_0M3  m'iliardI
+_1MA3 m'iliarda
+_0M4  bili'oni
+_1M4  bili'on
+_dpt  _:z'api*k&_
+_0and i
+
+// Roman numerals
+ii	$abbrev
+iii	$abbrev
+iv	$abbrev
+vii	$abbrev
+viii	$abbrev
+ix	$abbrev
+xi	$abbrev
+xii	$abbrev
+xiii	$abbrev
+xiv	$abbrev
+xvi	$abbrev
+xvii	$abbrev
+xviii	$abbrev
+xix	$abbrev
+xxi	$abbrev
+xxii	$abbrev
+xxiii	$abbrev
+xxiv	$abbrev
+xxvi	$abbrev
+xxvii	$abbrev
+xxviii	$abbrev
+xxix	$abbrev
+xxxi	$abbrev
+xxxii	$abbrev
+xxxiii	$abbrev
+xxxiv	$abbrev
+xxxvi	$abbrev
+xxxvii	$abbrev
+xxxviii  $abbrev
+xxxix	$abbrev
+
+// Abbreviations
+
+// Demonstratives
+кој      $u+
+што      $u+
+кого     $pause
+
+
+// Pronouns
+
+
+// Prepositions
+за        $u $brk
+во        $u $brk
+со        s_ $brk
+
+
+// Conjunctions
+а        a $u $pause    // and
+и        i_: $u $pause   // and
+или      $pause       // but
+него     $pause       // but
+или      $u $pause    // or
+
+
+
+
+
+// Auxillary verbs
+ли       $u      // question
+
+сум      $u      // to be, short form
+си       $u
+е        $u $brk
+сме      $u
+сте      $u
+се       $u
+
+бил      $u       // to be, past tense
+била     $u
+било     $u
+беа      $u
+
+несум    $u+      // to be, negative
+неси     $u+
+нее      $u+
+несме    $u+
+несте    $u+
+несе     $u+
+
+имам     $u+      // to have
+имаш     $u+
+има      $u+
+имаме    $u+
+имате    $u+
+имаат    $u+
+
+немам    $u+      // to have, negative
+немаш    $u+
+нема     $u+
+немаме   $u+
+немате   $u+
+немаат   $u+
+
+
+
+
+
+// treat as letters not words if at the end of the clause
+а        a    $atend    // letter-а
+е        E    $atend    // letter-е
+и        i_   $atend    // letter-и
+
+
+// Exceptions
+
diff --git a/dictsource/mk_rules b/dictsource/mk_rules
new file mode 100755
index 00000000..592c9dee
--- /dev/null
+++ b/dictsource/mk_rules
@@ -0,0 +1,297 @@
+// translation rules for Macedonian
+// This file is UTF-8 encoded
+
+.group а
+          а        a
+
+.group б
+          б        b
+
+.group в
+          в        v
+          в (_     f
+
+
+.group г
+          г       g
+
+.group д
+          д       d
+
+.group ѓ
+          ѓ       dZ;
+
+.group е
+          е       e
+
+.group ж
+          ж       Z
+
+.group з
+          з       z
+
+.group ѕ
+          ѕ       dz
+
+.group и
+          и       i
+       _) и       i_
+
+.group ј
+          ј       j
+
+.group к
+          к       k
+
+.group л
+          л       l
+
+.group љ
+          љ       l^
+
+.group м
+          м       m
+
+.group н
+          н       n
+
+.group њ
+          њ       n^
+
+.group о
+          о       o
+
+.group п
+          п       p
+
+.group р
+          р       R
+       A) р (A    R
+       K) р (A    @-*
+          рр      R
+          р (_    R
+       C) р (C    'r
+
+       K) р (K    'r-
+
+
+.group с
+          с       s
+ 
+.group т
+          т       t
+
+.group ќ
+          ќ       k^
+
+.group у
+          у       u
+
+.group ф
+          ф       f
+
+.group х
+          х       h
+
+.group ц
+          ц       ts
+
+.group ч
+          ч       tS;
+
+.group џ
+          џ       dZ
+
+.group ш
+          ш       S
+
+.group a
+        a        a
+        a (j     A
+        a (r     A        // don't reduce to [&]
+
+.group b
+        b        b
+
+.group c
+        c        ts
+
+.group č
+        č        tS
+
+.group ć
+        ć        tS;
+
+.group d
+        d        d
+        dz       dz
+        dž       dZ
+
+.group đ
+        đ        dZ;
+
+.group e
+        e        E
+     j) e        e
+        e (j     e
+    ._) exe      %ekse        // filetype
+
+.group f
+        f        f
+
+.group g
+        g        g
+
+.group h
+        h        h
+     _) h        x
+
+.group i
+        i        i
+    ._) ini      %ini         // filetype
+
+.group j
+        j        j
+    XA) j (_     j_      // short pause after final [j] in one-syllable words
+
+.group k
+        k        k
+
+.group l
+        l        l
+     K) l (K     l-
+        lj (+    l^
+
+.group m
+        m        m
+
+.group n
+        n        n
+        n (g     N
+        n (k     N
+
+        nj       n^
+
+.group o
+        o        o
+        ou       oU
+
+.group p
+        p        p
+
+.group q
+        q        k
+        qu       kv
+
+.group r
+        r        R
+     A) r (A     R
+     K) r (A     @-*
+        rr       R
+        r (_     R
+
+     K) r (K     'r-
+
+
+.group s
+        s        s
+
+.group š
+        š        S
+
+.group t
+        t        t
+
+.group u
+        u        u
+
+.group v
+        v        v
+
+.group w
+        w        v
+
+.group x
+        x        ks
+
+.group y
+        y        j
+     K) y (K     i
+
+
+.group z
+        z        z
+
+.group ž
+        ž        Z
+                  
+.group
+        á        a:
+        é        e:
+        í        i:
+        ó        o:
+        ú        u:
+
+        ä        _^_DE   // use German voice
+        ö        _^_DE
+        ü        _^_DE
+        ß        _^_DE
+
+        $        d'ol&R
+
+        .        totSk&
+        . (.     _:
+   \.)  .
+
+   __)  - (_D    minus
+   A_)  - (_D    _
+   C_)  - (_D    _
+    --) -
+
+        *        dzv'ezditSk&
+    *)  * (*
+        **
+   **)  * (_     _::
+
+        =            'edn&kvo
+        = (==
+    =)  = (=
+   ==)  = (_         _::
+
+.group 0xce   // Greek letters
+
+	α	'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
+
+	π	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 0d8e3f92..b0ce44cb 100644
--- a/phsource/compile_report
+++ b/phsource/compile_report
@@ -1,45 +1,45 @@
 38 phoneme tables
           new total
-    base  97   97
+    base  96   96
    base2  23  114
-      en  54  145
-    en_n  29  145
-   en_us  37  145
-   en_sc  39  147
-   en_rp  34  145
-   en_wm  30  145
-      af  38  129
-      cy  29  123
-      de  31  123
-      eo  12  108
-      fi  40  128
-      fr  33  119
-   fr_ca  11  119
-      hi  49  132
+      en  53  144
+    en_n  29  144
+   en_us  37  144
+   en_sc  39  146
+   en_rp  34  144
+   en_wm  30  144
+      af  38  128
+      cy  29  122
+      de  32  123
+      eo  13  108
+      fi  40  127
+      fr  35  118
+   fr_ca  11  118
+      hi  49  131
       hu  22  112
-      nl  26  118
+      nl  26  117
       pl  15  107
       sk  29  125
       cs   5  125
       hr  19  129
-      mk   1  129
+      mk  21  130
       sr   2  129
       ru  36  124
       it  17  117
-      la  21  115
+      la  21  114
       es   6  114
       pt  28  131
    pt_pt  20  131
       ro  36  138
       el   8  114
-      sv  25  119
-      no  28  123
-      is  32  122
-      vi  41  134
-     zhy  32  125
-      sw  14  106
+      sv  25  118
+      no  28  122
+      is  32  121
+      vi  41  133
+     zhy  32  124
+      sw  14  105
 
-  3  b/b            base hi ro
+  4  b/b            base fr hi ro
   2  b/b_           base hi
   2  b/b@           base hi
   2  b/b@2          base hi
@@ -49,22 +49,22 @@
   2  b/bo           base hi
   2  b/bu           base hi
   2  b/xb           base hi
- 15  d/d            base base2 fi hi hu pl hr ru ro el sw
- 15  d/d_           base base2 fi hi hu pl hr ru ro el sw
- 16  d/dr           base base2 fi hi hu pl hr ru ro el sw
+ 16  d/d            base base2 fi hi hu pl hr mk ru ro el sw
+ 16  d/d_           base base2 fi hi hu pl hr mk ru ro el sw
+ 17  d/dr           base base2 fi hi hu pl hr mk ru ro el sw
   1  d/tap          ro
   2  d/tap1         base
   2  d/tap2         base
   2  d/tap3         base
   1  d/tap_i        ro
- 13  d/xd           base base2 fi hi hu pl hr ru ro el sw
+ 14  d/xd           base base2 fi hi hu pl hr mk ru ro el sw
   2  d/xd_pzd       pl ru
   1  d/x_tap        base
-  5  dzh/dzh        base hi ru
-  5  dzh/dzh_       base hi ru
+  6  dzh/dzh        base hi mk ru
+  6  dzh/dzh_       base hi mk ru
   2  dzh/dz_pzd     base hi
   2  dzh/dz_pzd_    base hi
-  5  dzh/xdzh       base hi ru
+  6  dzh/xdzh       base hi mk ru
   2  dzh/xdz_pzd    base hi
   4  envelope/p_fall vi zhy
   1  envelope/p_fallrise vi
@@ -178,7 +178,7 @@
   1  r2/r2i         base
   1  r2/r2o         base
   1  r2/r2u         base
-  3  r3/r_          base af ru
+  4  r3/r_          base af fr ru
   1  r3/r_@         base
   1  r3/r#_         is
   1  r3/r_a         base
@@ -187,8 +187,8 @@
   2  r3/r_n         base ru
   1  r3/r_o         base
  11  r3/r_trill     base af cy nl sk pt
-  2  r3/r_trill2    base hr
-  2  r3/r_trill2.wav base hr
+  3  r3/r_trill2    base hr mk
+  3  r3/r_trill2.wav base hr mk
   8  r3/r_trill3.wav base af cy nl
   3  r3/r_trill.wav base sk pt
   1  r3/r_u         base
@@ -196,7 +196,7 @@
   2  r3/rz_cs       sk
   2  r3/@tap        base
   2  r3/@tap_i      base
-  6  r/r            base en_sc de fr pt_pt
+  5  r/r            base en_sc de pt_pt
   3  r/_r           base en_sc pt_pt
   9  r/r_           base en_sc de fi nl ru pt_pt ro sw
   1  r/r@           base
@@ -238,29 +238,29 @@
   1  ufric/tl#      is
   2  ufric/x        base vi
   4  ufric/x2       af nl pt
-  1  ufric/x_hr     hr
+  2  ufric/x_hr     hr mk
   1  ustop/c        base
   5  ustop/k        base en fr hi sw
  10  ustop/k_       base base2 en fi fr hi hu sk el sw
- 13  ustop/ki       base base2 en af fi fr hi hu sk is sw
+ 14  ustop/ki       base base2 en af fi fr hi hu sk mk is sw
  11  ustop/kl       base base2 en fi fr hi hu sk el sw
  12  ustop/kr       base base2 en fi fr hi hu sk el sw
  10  ustop/k_unasp  base base2 fi hi hu sk el
-  2  ustop/p        base hi
-  2  ustop/p_       base hi
+  3  ustop/p        base fr hi
+  3  ustop/p_       base fr hi
   1  ustop/percus10 base
-  9  ustop/pl       base base2 fi hi hu sk la ro
+ 10  ustop/pl       base base2 fi fr hi hu sk la ro
   9  ustop/pr       base base2 fi hi hu la ro
-  8  ustop/p_unasp  base base2 fi hi hu sk la ro
+  9  ustop/p_unasp  base base2 fi fr hi hu sk la ro
   7  ustop/p_unasp_ base2 fi hi hu sk la ro
   6  ustop/t        base en fr hi
   8  ustop/t_       base en fr hi sk el
- 22  ustop/t_dnt    base base2 en fi hi hu pl hr ru ro vi sw
+ 24  ustop/t_dnt    base base2 en fi hi hu pl hr mk ru ro vi ++
   1  ustop/t_dnt2   vi
   2  ustop/t_hi     hi
   4  ustop/t_pzd    pl ru
   7  ustop/tr       base en hi ru
-  7  ustop/ts       base base2 hu pl ru ro zhy
+  8  ustop/ts       base2 de eo hu pl ru ro zhy
   2  ustop/tsh      base zhy
   2  ustop/tsh_     base zhy
   3  ustop/t_short  hi sk el
@@ -303,7 +303,7 @@
   1  vdiph/aau_4    vi
   1  vdiph/ae       fr_ca
   1  vdiph/ae_2     en_n
-  7  vdiph/ai       base2 eo sk hr it pt vi
+  8  vdiph/ai       base2 eo sk hr mk it pt vi
   3  vdiph/ai_2     en_us cy
   1  vdiph/ai_3     no
   1  vdiph/ai_4     af
@@ -405,7 +405,7 @@
   1  voc/zh_2       sk
   2  voc/z_pzd      base
   2  voc/z_pzd_     base
- 14  vowel/@        base en en_us en_rp cy hi hr
+ 15  vowel/@        base en en_us en_rp cy hi hr mk
   1  vowel/@-       base
   4  vowel/&        en_rp fi hi sv
   4  vowel/0        base2 en hi pt
@@ -419,10 +419,10 @@
   1  vowel/@_4      nl
   2  vowel/8_2      en_us sv
   1  vowel/8_3      zhy
- 14  vowel/a        en_n cy de hu nl pl sk hr sr it la
+ 16  vowel/a        en_n cy de hu nl pl sk hr mk sr it la
   4  vowel/a#       base2 en_sc pt
   7  vowel/a_2      base2 eo la pt pt_pt ro vi
-  4  vowel/a#_2     hr sv is sw
+  5  vowel/a#_2     hr mk sv is sw
   7  vowel/a_3      en_sc fr cs is
  12  vowel/a#_3     en en_n en_us en_wm de hi ru pt_pt vi zhy
   4  vowel/a_4      en_wm el vi
@@ -437,7 +437,7 @@
   1  vowel/aa_7     nl
   3  vowel/a_en     en fr
   1  vowel/@_bck    hi
- 14  vowel/e        base2 en en_n af cy eo fr hr it la pt pt_pt ++
+ 15  vowel/e        base2 en en_n af cy eo fr hr mk it la pt ++
   2  vowel/e#       en_sc
   7  vowel/e_2      en_sc de hi it sv no
   1  vowel/e_3      hu
@@ -449,9 +449,9 @@
   1  vowel/ee#_2    sv
   4  vowel/ee_3     af pt vi
   3  vowel/ee_6     en_n sk sv
- 13  vowel/e_mid    en_rp en_wm fr_ca hi hu sk cs hr it es pt_pt no ++
+ 14  vowel/e_mid    en_rp en_wm fr_ca hi hu sk cs hr mk it es pt_pt ++
  10  vowel/e_mid2   af de fi nl sk ro el sw
-  1  vowel/@_fnt    hr
+  2  vowel/@_fnt    hr mk
   1  vowel/@_hgh    no
  19  vowel/i        base2 en_n en_rp en_wm cy eo fr hu pl it pt pt_pt ++
   1  vowel/i#       cy
@@ -460,13 +460,13 @@
   4  vowel/i_4      fi hu it is
   5  vowel/i_5      en_sc
   3  vowel/i#_5     pt_pt ro
-  1  vowel/i_6      hr
+  2  vowel/i_6      hr mk
   3  vowel/i_en     en en_us vi
   2  vowel/i_fnt    hi
  10  vowel/ii       en_wm cy de fr_ca nl is zhy
   3  vowel/ii#      cy pl ru
   1  vowel/ii_2     la
-  7  vowel/ii_3     en_rp fi hi sk hr sv no
+  8  vowel/ii_3     en_rp fi hi sk hr mk sv no
   2  vowel/ii_4     en_rp
   6  vowel/ii_en    en en_n
   5  vowel/@_low    hi ro no
@@ -483,7 +483,7 @@
   1  vowel/oe_4     sv
   2  vowel/o_mid    fr hu
   9  vowel/oo       en_sc de eo la es el sv no zhy
- 11  vowel/oo_1     en_n en_rp en_wm af fi sk hr vi
+ 12  vowel/oo_1     en_n en_rp en_wm af fi sk hr mk vi
   3  vowel/oo_2     en_sc cy cs
   1  vowel/oo_3     af
   3  vowel/oo_4     hi pl it
@@ -492,12 +492,12 @@
   2  vowelr/aa_r    en_sc
   1  vowelr/oo_r    en_sc
   1  vowelr/o_r     en_sc
-  4  vowelr/r-voc   hi sk hr
+  5  vowelr/r-voc   hi sk hr mk
   2  vowelr/V3_r    en en_sc
   1  vowelr/V_r     en
   7  vowel/u        en_n cy de eo fr cs la
   5  vowel/u#       en en_sc
-  5  vowel/u_2      fi fr sk hr ro
+  6  vowel/u_2      fi fr sk hr mk ro
   1  vowel/u#_2     sv
   1  vowel/u_3      ro
   1  vowel/u#_3     en_n
@@ -506,7 +506,7 @@
   1  vowel/u_5      sw
   3  vowel/u_6      en_rp pt_pt
   1  vowel/u_7      vi
- 17  vowel/u_bck    base2 cy fi fr_ca hi hu nl pl sk hr it pt ++
+ 18  vowel/u_bck    base2 cy fi fr_ca hi hu nl pl sk hr mk it ++
   2  vowel/uu       en en_wm
   3  vowel/uu_2     base2 de la
   1  vowel/uu_3     af
@@ -611,13 +611,13 @@
   5  w/xw           base
  20  x/b            base hi ro is
   1  x/b_           base
- 10  x/d            base en_us hi hr el is
- 13  x/d_           base base2 fi hi pl hr ru ro el is sw
+ 12  x/d            base en_us hi hr mk el is
+ 14  x/d_           base base2 fi hi pl hr mk ru ro el is sw
  21  x/d_dnt        base base2 fi hi hu pl ru ro sw
   6  x/d_pzd        pl ru
   4  x/dzh          base hi
-  5  x/dzh_         base hi ru
-  4  x/dz_pzd       base hi ru
+  6  x/dzh_         base hi mk ru
+  5  x/dz_pzd       base hi mk ru
   1  x/dz_pzd_      hi
   4  x/g_           base cy es is
   5  x/g2           base cy hi es is
diff --git a/phsource/ph_french b/phsource/ph_french
index 126ce1a1..d2e3064f 100644
--- a/phsource/ph_french
+++ b/phsource/ph_french
@@ -213,7 +213,7 @@ phoneme r/   // used for [r] when not preceding a vowel
   vcd uvl frc
   length 100
   lengthmod 2   //
-  formants r/r
+  formants r3/r_
 //   before n   r3/r_n+r3/rx
 endphoneme
 
@@ -279,6 +279,31 @@ phoneme v
 endphoneme
 
 
+phoneme B
+  vcd blb frc
+  vowelin  f1=2  f2=1000 -300 -200  f3=-100 100
+  vowelout f1=2  f2=1000 -500 -300  f3=-100 60  len=50
+  lengthmod 6
+  formants b/b
+  switchvoicing f
+endphoneme
+
+
+phoneme p
+  vls blb stop
+  vowelin  f1=0  f2=1000 -50 -100  f3=-200 80 amp=11
+  vowelout f1=0  f2=1000 -500 -350  f3=-300 80 rms=22
+  lengthmod 2
+  wave ustop/p
+  before _ ustop/p_
+//  before r ustop/pr
+//  before R ustop/pr
+  before @- ustop/p_unasp
+  before l ustop/pl
+  switchvoicing b
+endphoneme
+
+
 
 
 
diff --git a/phsource/ph_macedonian b/phsource/ph_macedonian
index e96097bc..d9b75063 100644
--- a/phsource/ph_macedonian
+++ b/phsource/ph_macedonian
@@ -1 +1,166 @@
-// Initially empty
+phoneme @    //  Schwa
+  vowel   starttype (@)  endtype (@)
+  formants vowel/@
+  length 140
+endphoneme
+
+phoneme @2    //  Schwa (raised)
+  vowel   starttype (@)  endtype (@)
+  formants vowel/@_fnt
+  length 140
+endphoneme
+
+
+phoneme a
+  vowel starttype (a) endtype (a)
+  length 160
+  formants vowel/a
+  reduceto &  4
+endphoneme
+
+
+phoneme A          // 'a' before 'r', doesn't reduce to [&]
+  vowel starttype (a) endtype (a)
+  length 160
+  formants vowel/a
+endphoneme
+
+
+phoneme &
+  vowel starttype (a) endtype (a)
+  length 140
+  formants vowel/a#_2
+endphoneme
+
+
+phoneme E
+  vowel starttype (e) endtype (e)
+  length 140
+  formants vowel/e_mid
+endphoneme
+
+
+phoneme e
+  vowel starttype (e) endtype (e)
+  length 140
+  formants vowel/e
+endphoneme
+
+
+phoneme i
+  vowel starttype (i) endtype (i)
+  length 120
+  formants vowel/i_6
+  linkout ;
+  reduceto I  4
+endphoneme
+
+
+phoneme I
+  vowel starttype (i) endtype (i)
+  length 120
+  formants vowel/ii_3
+  linkout ;
+endphoneme
+
+
+phoneme o
+  vowel starttype (o) endtype (o)
+  length 140
+  formants vowel/oo_1
+endphoneme
+
+
+phoneme u
+  vowel starttype (u) endtype (u)
+  length 140
+  formants vowel/u_bck
+  reduceto U  4
+endphoneme
+
+
+phoneme U
+  vowel starttype (u) endtype (u)
+  length 140
+  formants vowel/u_2
+endphoneme
+
+
+phoneme aI
+  vowel starttype (a) endtype (i)
+  length 250
+  formants vdiph/ai
+endphoneme
+
+
+
+
+phoneme t        // dental variant of /t/
+  vls dnt stop
+  vowelin f1=0  f2=1600 -300 300  f3=-100 80
+  vowelout f1=0 f2=1600 -300 250  f3=-100 80  rms=20
+  lengthmod 2
+  wave  ustop/t_dnt%50
+  before _ ustop/t_dnt%35
+  switchvoicing d
+endphoneme
+
+
+phoneme d
+  vcd alv stop
+  vowelin f1=2  f2=1700 -300 300  f3=-100 80 amp=16
+  vowelout f1=2 f2=1700 -300 300  f3=-100 80
+  formants d/d+x/d%50
+  before _ d/d_+x/d_
+  before r d/dr+x/d%50
+  after _ NULL
+  after @ d/xd
+  lengthmod 5
+  switchvoicing t
+endphoneme
+
+
+
+phoneme x
+  vls vel frc
+  vowelin f1=0  f2=2300 200 400  f3=-100 80
+  vowelout f1=0 f2=2300 300 400  f3=-100 80  rms=20
+  length 100
+  lengthmod 3
+  wave ufric/x_hr%45
+  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
+  vowelout f1=2  f2=1600 -300 300  f3=-200 80 brk
+  formants r3/r_trill2+r3/r_trill2.wav%65
+  trill
+  lengthmod 6
+endphoneme
+
+phoneme k^
+  vls pal stop
+  vowelin f1=0  f2=2700 400 600  f3=400 80
+  vowelout f1=0 f2=2700 400 600  f3=400 80  rms=20
+  lengthmod 2
+  wave ustop/ki
+endphoneme
+
+phoneme dZ;
+  vcd pal afr sibilant palatal
+  vowelin f1=2  f2=2700 400 600  f3=300 80 rate len=70
+  formants dzh/dzh+x/dz_pzd
+  before _ dzh/dzh_+x/dzh_
+  after _ NULL
+  after @ dzh/xdzh
+  lengthmod 5
+  switchvoicing ts;
+endphoneme
\ No newline at end of file
diff --git a/phsource/phonemes b/phsource/phonemes
index a8c18160..ef35aa64 100644
--- a/phsource/phonemes
+++ b/phsource/phonemes
@@ -950,7 +950,7 @@ endphoneme
 
 phoneme c
   vls pal stop
-  vowelin f1=0  f2=2700 200 500  f3=500 80 rate len=80
+  vowelin f1=0  f2=2700 200 500  f3=400 80 rate len=80
   vowelout f1=0  f2=2700 300 500  f3=300 80
   lengthmod 2
   wave ustop/c%130
diff --git a/phsource/vowel/y#_2 b/phsource/vowel/y#_2
index 06f94e95..5c6ee825 100644
Binary files a/phsource/vowel/y#_2 and b/phsource/vowel/y#_2 differ
diff --git a/src/numbers.cpp b/src/numbers.cpp
index 0e841c0e..6e2da9c2 100644
--- a/src/numbers.cpp
+++ b/src/numbers.cpp
@@ -451,7 +451,7 @@ static char *M_Variant(int value)
 		}
 
 	}
-	return("M");
+	return("0M");
 }
 
 
diff --git a/src/synthdata.cpp b/src/synthdata.cpp
index 87775b9e..03eaf37f 100755
--- a/src/synthdata.cpp
+++ b/src/synthdata.cpp
@@ -35,7 +35,7 @@
 #include "translate.h"
 #include "wave.h"
 
-const char *version_string = "1.27.04  04.Jul.07";
+const char *version_string = "1.27.05  05.Jul.07";
 const int version_phdata  = 0x012701;
 
 int option_device_number = -1;