diff --git a/dictsource/mi_list b/dictsource/mi_list
index b9c219ee..3ec70cd6 100644
--- a/dictsource/mi_list
+++ b/dictsource/mi_list
@@ -3,15 +3,15 @@ _0	kore
 _1	tahi
 _2	rua
 _3	toru
-_4	faa
+_4	fa:
 _5	rima
 _6	ono
 _7	whitu
 _8	waru
 _9	iwa
 
-// Stress and raru / raruraru fix
-kōrero $1 //first syllable
+// Words
+kōrero $1
 raru 'ra_ru
 raruraru 'ra_ru_:ra_ru
-urupā u_rupaa
+urupā u_rupa:
diff --git a/dictsource/mi_rules b/dictsource/mi_rules
index c29d6c82..59b5d216 100644
--- a/dictsource/mi_rules
+++ b/dictsource/mi_rules
@@ -1,39 +1,39 @@
 // This file is UTF-8 encoded
-// The first symbol(s) is/are the orthography
-// The second symbol(s) is/are the name of the phoneme
-
 // Māori
 
+// vowels
+
 .group a
              a            a
 
 .group ā
-             ā            aa
+             ā            a:
 
 .group e
              e            e
 
 .group ē
-             ē            ee
+             ē            e:
 
 .group i
              i            i
 
 .group ī
-             ī            ii
+             ī            i:
 
 .group o
              o            o
 
 .group ō
-             ō            oo
+             ō            o:
 
 .group u
              u            u
 
 .group ū
-             ū            uu
+             ū            u:
 
+// consonants
 
 .group h
              h            h
@@ -46,7 +46,7 @@
 
 .group n
              n            n
-			 ng			  ng
+             ng           N
 
 .group p
              p            p
@@ -59,4 +59,4 @@
 
 .group w
              w            w
-			 wh			  f
+             wh           f
diff --git a/phsource/ph_maori b/phsource/ph_maori
index 86947a76..022f796e 100644
--- a/phsource/ph_maori
+++ b/phsource/ph_maori
@@ -1,81 +1,76 @@
 // Māori phonemes
-// what follows the word 'phoneme' is the name of the phoneme
 
 //=======
 // VOWELS
 //=======
-phoneme a //so the name of this phoneme is 'a'
+
+phoneme a
   vwl starttype #a endtype #a
   length 140
-  FMT(vowel/a_5) //from latin
+  FMT(vowel/a_5) // from latin
 endphoneme
 
-phoneme aa //so the name of this phoneme is 'aa'
+phoneme a:
   vwl starttype #a endtype #a
   length 280
-  FMT(vowel/a_5) //copied from above and length doubled
+  FMT(vowel/a_5)
 endphoneme
 
 phoneme e
   vwl starttype #e endtype #e
   length 140
-  FMT(vowel/e) //working hypothesis
+  FMT(vowel/e) // working hypothesis
 endphoneme
 
-phoneme ee
+phoneme e:
   vwl starttype #e endtype #e
   length 280
-  FMT(vowel/e) //copied from above and length doubled
+  FMT(vowel/e)
 endphoneme
 
 phoneme i
   vwl starttype #i endtype #i
   length 140
-  FMT(vowel/i) //working hypothesis
+  FMT(vowel/i) // working hypothesis
 endphoneme
 
-phoneme ii
+phoneme i:
   vwl starttype #i endtype #i
   length 280
-  FMT(vowel/i) //copied from above and length doubled
+  FMT(vowel/i)
 endphoneme
 
 phoneme o
   vwl starttype #o endtype #o
   length 140
-  FMT(vowel/o) //working hypothesis
+  FMT(vowel/o) // working hypothesis
 endphoneme
 
-phoneme oo
+phoneme o:
   vwl starttype #o endtype #o
   length 280
-  FMT(vowel/o) //copied from above and length doubled
+  FMT(vowel/o)
 endphoneme
 
 phoneme u
   vwl starttype #u endtype #u
   length 140
-  FMT(vowel/u) //working hypothesis
+  FMT(vowel/u) // working hypothesis
 endphoneme
 
-phoneme uu
+phoneme u:
   vwl starttype #u endtype #u
   length 280
-  FMT(vowel/u) //copied from above and length doubled
+  FMT(vowel/u)
 endphoneme
 
-//==========
-// DIPTHONGS
-//==========
-
 //===========
 // CONSONANTS
 //===========
 
-phoneme ng // si**ng** taken from Kyrgz (deleting what seemed from testing to be not needed)
+phoneme N // si**ng** (modified from Kyrgz)
   vcd vel nas
 
-// don't really know why this works but is does
   NextVowelStarts
     VowelStart(nn/nn@)
     VowelStart(nn/nna)
@@ -84,6 +79,5 @@ phoneme ng // si**ng** taken from Kyrgz (deleting what seemed from testing to be
     VowelStart(nn/nno)
     VowelStart(nn/nnu)
   EndSwitch
-
 endphoneme
 
diff --git a/tests/language-phonemes.test b/tests/language-phonemes.test
index 26116384..c1e120e3 100755
--- a/tests/language-phonemes.test
+++ b/tests/language-phonemes.test
@@ -96,4 +96,4 @@ test_lang la 080bd53c20991eae7baec73b8c735eacc8aae076 "ma na Na pa p<h>a ba ta t
 test_lang lfn 044e27a5100528760a185e0773dccaca504b5bd4 "ma na Na pa ba ta da ka ga fa va sa za Sa Za ha la ja R2a **a wa _:_ ma me mi mo mu maI maU meU moI"
 test_lang lt 615e503b996ea5f7b267ebd77b91e77c5b874e18 "ma m;a na n;a pa p;a ta t;a ka k;a ba b;a da d;a ga g;a tsa ts;a tSa tS;a dza dz;a dZa dZ;a fa f;a sa s;a Sa S;a xa x;a va v;a za z;a Za Z;a la l;a ra r;a ja _:_ m@ ma mA ma: me mE me: mee meA mi mI mi: mo mO mo: mu mU mu: mw mW mai mei mau muo moi mui mie maU meU moU maI meI"
 test_lang lv fb8ffd5e5b76184e215a3f75487fbb0079472b5b "ma na n^a Na pa ba ta da ca Ja ka ga tsa dza Dz\`a tSa dZa DZ\`a fa va sa za Sa Za xa ha ja la l^a Ra ra _:_ mi my mu mE me mo ma mi: my: mu: mE: me: mo: ma: mai mau mei mie miu mui muo muo\` moi"
-test_lang mi b6e622de46c33181cdfea351b907f932da9a0a1a "ma na nga pa ta ka fa ha ra wa _:_ ma maa me mee mi mii mo moo mu muu"
+test_lang mi b6e622de46c33181cdfea351b907f932da9a0a1a "ma na Na pa ta ka fa ha ra wa _:_ ma ma: me me: mi mi: mo mo: mu mu:"