diff --git a/languoids/glottocodes.json b/languoids/glottocodes.json
index 58f4be179b..4a05474878 100644
--- a/languoids/glottocodes.json
+++ b/languoids/glottocodes.json
@@ -4356,6 +4356,7 @@
     "klfl": 1238, 
     "klia": 1235, 
     "klik": 1240, 
+    "klin": 1234, 
     "klis": 1237, 
     "kllu": 1238, 
     "klon": 1234, 
@@ -6270,6 +6271,7 @@
     "niue": 1239, 
     "niva": 1238, 
     "nive": 1238, 
+    "niwe": 1235, 
     "niza": 1234, 
     "nizo": 1239, 
     "njak": 1238, 
diff --git a/languoids/tree/arti1236/klin1234/md.ini b/languoids/tree/arti1236/klin1234/md.ini
new file mode 100644
index 0000000000..97311fdeb1
--- /dev/null
+++ b/languoids/tree/arti1236/klin1234/md.ini
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+[core]
+name = Klingon
+level = language
+iso639-3 = tlh
+hid = tlh
+
diff --git a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/make1251/md.ini b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/make1251/md.ini
index 2a634b5dff..e4dfad6808 100644
--- a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/make1251/md.ini
+++ b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/make1251/md.ini
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 [core]
-name = Maket
+name = Fanamaket
 level = dialect
 macroareas = 
 	Papunesia
 countries = 
+iso639-3 = bjp
 
 [altnames]
 multitree = 
diff --git a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/anir1237/md.ini b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/anir1237/md.ini
similarity index 82%
rename from languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/anir1237/md.ini
rename to languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/anir1237/md.ini
index 5fe28d278e..58bc89f938 100644
--- a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/anir1237/md.ini
+++ b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/anir1237/md.ini
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 [core]
-name = Anir
+name = Warwar Feni
 level = dialect
 macroareas = 
 	Papunesia
 countries = 
+iso639-3 = hrw
 
 [altnames]
 multitree = 
diff --git a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/md.ini b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/md.ini
new file mode 100644
index 0000000000..cb9970a517
--- /dev/null
+++ b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/md.ini
@@ -0,0 +1,5 @@
+# -*- coding: utf-8 -*-
+[core]
+name = Niwer Mil-Warwar Feni
+level = dialect
+
diff --git a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/niwe1234/md.ini b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/niwe1234/md.ini
new file mode 100644
index 0000000000..79a6e96c9c
--- /dev/null
+++ b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/niwe1235/niwe1234/md.ini
@@ -0,0 +1,7 @@
+# -*- coding: utf-8 -*-
+[core]
+name = Niwer Mil
+level = dialect
+iso639-3 = hrc
+hid = hrc
+
diff --git a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/tang1349/md.ini b/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/tang1349/md.ini
deleted file mode 100644
index 056b9d021d..0000000000
--- a/languoids/tree/aust1307/nucl1752/mala1545/cent2237/east2712/ocea1241/west2818/meso1253/newi1242/stge1234/tang1348/tang1349/md.ini
+++ /dev/null
@@ -1,15 +0,0 @@
-# -*- coding: utf-8 -*-
-[core]
-name = Tanga
-level = dialect
-macroareas = 
-	Papunesia
-countries = 
-
-[altnames]
-multitree = 
-	Tanga
-
-[identifier]
-multitree = tgg-tan
-
diff --git a/languoids/tree/chin1490/lowe1438/chin1286/kiks1237/md.ini b/languoids/tree/chin1490/lowe1438/chin1286/kiks1237/md.ini
deleted file mode 100644
index 4e8b58610c..0000000000
--- a/languoids/tree/chin1490/lowe1438/chin1286/kiks1237/md.ini
+++ /dev/null
@@ -1,8 +0,0 @@
-# -*- coding: utf-8 -*-
-[core]
-name = Kiksht
-level = dialect
-macroareas = 
-	North America
-countries = 
-