diff --git a/src/dutch/IrregDut.gf b/src/dutch/IrregDut.gf
index fd329982..bd491ced 100644
--- a/src/dutch/IrregDut.gf
+++ b/src/dutch/IrregDut.gf
@@ -27,7 +27,7 @@ lin brouwen_V = mkV "brouwen" "brouwde" "brouwden" "gebrouwen" ;
 lin buigen_V = mkV "buigen" "boog" "bogen" "gebogen" ;
 lin denken_V = mkV "denken" "dacht" "dachten" "gedacht" ;
 lin dingen_V = mkV "dingen" "naar" "dong" "naar" ;
-lin doen_V = mkV "doen" "deed" "deden" "gedaan" ;
+lin doen_V = mkV "doe" "doet" "doet" "doen" "deed" "deed" "deden" "gedaan" ;
 lin dragen_V = mkV "dragen" "droeg" "droegen" "gedragen" ;
 lin drijven_V = mkV "drijven" "dreef" "dreven" "gedreven" ;
 lin dringen_V = mkV "dringen" "drong" "drongen" "gedrongen" ;
@@ -38,7 +38,7 @@ lin dwingen_V = mkV "dwingen" "dwong" "dwongen" "gedwongen" ;
 lin eten_V = mkV "eten" "at" "aten" "gegeten" ;
 lin fluiten_V = mkV "fluiten" "floot" "floten" "gefloten" ;
 lin gelden_V = mkV "gelden" "gold" "golden" "gegolden" ;
-lin gaan_V = mkZijnV "gaan" "ging" "gingen" "gegaan" ;
+lin gaan_V = zijnV (mkV "ga" "gaat" "gaan" "ging" "gingen" "gegaan") ;
 lin genezen_V = mkZijnHebbenV "genezen" "genas" "genazen" "genezen" ;
 lin genieten_V = mkV "genieten" "genoot" "genoten" "genoten" ;
 lin geven_V = mkV "geven" "gaf" "gaven" "gegeven" ;
@@ -102,7 +102,7 @@ lin schenken_V = mkV "schenken" "schonk" "schonken" "geschonken" ;
 lin scheppen_V = mkV "scheppen" "shiep" "schiepen" "geschapen" ;
 lin scheren_V = mkV "scheren" "scheerde" "scheerden" "geschoren" ;
 lin schieten_V = mkV "schieten" "schoot" "schoten" "geschoten" ;
-lin schijnen_V = mkV "schijnen" "scheen" "schenen" "1." ;
+lin schijnen_V = mkV "schijnen" "scheen" "schenen" "geschenen" ;
 lin verschijnen_V = mkZijnV "verschijnen" "verscheen" "verschenen" "verschenen" ;
 lin schijten_V = mkV "schijten" "scheet" "scheten" "gescheten" ;
 lin schrijven_V = mkV "schrijven" "schreef" "schreven" "geschreven" ;
@@ -129,7 +129,7 @@ lin spreken_V = mkV "spreken" "sprak" "spraken" "gesproken" ;
 lin springen_V = mkZijnHebbenV "springen" "sprong" "sprongen" "gesprongen" ;
 lin spruiten_V = mkZijnV "spruiten" "sproot" "sproten" "gesproten" ;
 lin spuiten_V = mkV "spuiten" "spoot" "spoten" "gespoten" ;
-lin staan_V = mkV "staan" "stond" "stonden" "gestaan" ;
+lin staan_V = mkV "sta" "staat" "staan" "stond" "stonden" "gestaan" ;
 lin steken_V = mkV "steken" "stak" "staken" "gestoken" ;
 lin stelen_V = mkV "stelen" "stal" "stalen" "gestolen" ;
 lin sterven_V = mkZijnV "sterven" "stierf" "stierven" "gestorven" ;
diff --git a/src/dutch/LexiconDut.gf b/src/dutch/LexiconDut.gf
index ba1dac21..a5d7016c 100644
--- a/src/dutch/LexiconDut.gf
+++ b/src/dutch/LexiconDut.gf
@@ -28,8 +28,8 @@ lin
   brown_A = mkA "bruin" ;
   buy_V2 = mkV2 (mkV "kopen" "kocht" "gekocht") ;
   child_N = mkN "kind" "kinderen" neuter ;
-  come_V = zijnV (mkV "kom" "komt" "komen" "kwam" "kwamen" "gekomen") ;
-  die_V = zijnV (mkV "sterven" "stierf" "gestorven") ;
+  come_V = komen_V ;
+  die_V = sterven_V ;
   distance_N3 = mkN3 (mkN "afstand") van_Prep (mkPrep "naar") ;
   drink_V2 = mkV2 drinken_V ;
   easy_A2V = mkA2 (mkA "gemakkelijk") noPrep ;
@@ -97,7 +97,7 @@ cap_N = mkN "kap" utrum ;
 car_N = mkN "auto" utrum ;
 carpet_N = mkN "tapijt" neuter ;
 cat_N = mkN "kat" utrum ;
-ceiling_N = mkN "plafond" neuter ;
+ceiling_N = mkN "plafond" "plafonds" neuter ;
 chair_N = mkN "stoel" utrum ;
 cheese_N = mkN "kaas" utrum ;
 church_N = mkN "kerk" utrum ;
@@ -106,16 +106,16 @@ clean_A = mkA "schoon" ;
 clever_A = mkA "slim" ;
 close_V2 = mkV2 sluiten_V ;
 cloud_N = mkN "wolk" utrum ;
-coat_N = mkN "vacht" utrum ;
+coat_N = mkN "jas" utrum ;
 cold_A = mkA "koud" ;
 computer_N = mkN "computer" utrum ;
 correct_A = mkA "correct" ;
 count_V2 = mkV2 "rekenen" ;
 country_N = mkN "land" neuter ;
 cousin_N = mkN "neef" utrum ;
-cow_N = mkN "koe" utrum ;
+cow_N = mkN "koe" "koeien" utrum ;
 cut_V2 = mkV2 snijden_V ;
-day_N = mkN "dag" utrum ;
+day_N = mkN "dag" "dagen" utrum ;
 dig_V = graven_V ;
 dirty_A = mkA "vuil" ;
 do_V2 = mkV2 doen_V ;
@@ -126,8 +126,8 @@ dry_A = mkA "droog" ;
 dull_A = mkA "saai" ;
 dust_N = mkN "stof" neuter ;
 ear_N = mkN "oor" neuter ;
-earth_N = mkN "aarde" utrum ;
-egg_N = mkN "ei" neuter ;
+earth_N = mkN "aard" utrum ;
+egg_N = mkN "ei" "eieren" neuter ;
 empty_A = mkA "leeg" ;
 enemy_N = mkN "vijand" utrum ;
 eye_N = mkN "oog" neuter ;
@@ -176,17 +176,17 @@ heavy_A = mkA "zwaar" ;
 hill_N = mkN "heuvel" utrum ;
 hit_V2 = mkV2 "raken" ;
 hold_V2 = mkV2 houden_V ;
-horn_N = mkN "hoorn" utrum ;
+horn_N = mkN "hoorn" "hoorns" utrum ;
 horse_N = mkN "paard" neuter ;
 hot_A = mkA "heet" ;
-hunt_V2 = mkV2 "jagen" ;
+hunt_V2 = mkV2 jagen_V ;
 husband_N = mkN "man" utrum ;
 ice_N = mkN "ijs" neuter ;
 important_A = mkA "belangrijk" ;
 industry_N = mkN "industrie" "industrieën" utrum ;
 iron_N = mkN "ijzer" neuter ;
 jump_V = springen_V ;
-kill_V2 = mkV2 "dooden" ;
+kill_V2 = mkV2 "doden" ;
 king_N = mkN "koning" utrum ;
 knee_N = mkN "knie" utrum ;
 know_V2 = mkV2 "kennen" ;
@@ -200,7 +200,7 @@ leather_N = mkN "leer" neuter ;
 leave_V2 = mkV2 (mkV "verlaten" "verliet" "verlieten" "verlaten") ;
 leg_N = mkN "been" neuter ;
 lie_V = liggen_V ;
-like_V2 = mkV2 (partV (mkV "vinden") "leuk") ;
+like_V2 = mkV2 (partV vinden_V "leuk") ;
 listen_V2 = mkV2 "luisteren" ;
 live_V = mkV "leven" ;
 liver_N = mkN "lever" utrum ;
@@ -225,7 +225,7 @@ newspaper_N = mkN "krant" utrum ;
 night_N = mkN "nacht" utrum ;
 nose_N = mkN "neus" utrum ;
 number_N = mkN "nummer" neuter ;
-oil_N = mkN "olie-schakelaars" utrum ;
+oil_N = mkN "olie" "oliën" utrum ;
 old_A = mkA "oud" ;
 open_V2 = mkV2 "openen" ;
 paper_N = mkN "papier" neuter ;
@@ -254,15 +254,15 @@ reason_N = mkN "reden" utrum ;
 religion_N = mkN "religie" utrum ;
 restaurant_N = mkN "restaurant" neuter ;
 river_N = mkN "rivier" utrum ;
-road_N = mkN "weg" utrum ;
+road_N = mkN "weg" "wegen" utrum ;
 rock_N = mkN "rots" utrum ;
-roof_N = mkN "dak" neuter ;
+roof_N = mkN "dak" "daken" neuter ;
 root_N = mkN "wortel" utrum ;
 rope_N = mkN "touw" neuter ;
 rotten_A = mkA "verrot" ;
 round_A = mkA "rond" ;
 rub_V2 = mkV2 wrijven_V ;
-rubber_N = mkN "rubberen" utrum ;
+rubber_N = mkN "rubber" "rubbers" utrum ;
 rule_N = mkN "regel" utrum ;
 run_V = zijnV (mkV "rennen") ;
 salt_N = mkN "zout" neuter ;
@@ -276,14 +276,14 @@ seek_V2 = mkV2 zoeken_V ;
 sew_V = mkV "naaien" ;
 sharp_A = mkA "scherp" ;
 sheep_N = mkN "schaap" neuter ;
-ship_N = mkN "schip" neuter ;
+ship_N = mkN "schip" "schepen" neuter ;
 shirt_N = mkN "shirt" neuter ;
 shoe_N = mkN "schoen" utrum ;
 shop_N = mkN "winkel" utrum ;
 short_A = mkA "kort" ;
 silver_N = mkN "zilver" neuter ;
 sing_V = zingen_V ;
-sister_N = mkN "zuster" utrum ;
+sister_N = mkN "zus" utrum ;
 sit_V = zitten_V ;
 skin_N = mkN "huid" utrum ;
 sky_N = mkN "lucht" utrum ;
@@ -324,7 +324,7 @@ thick_A = mkA "dik" ;
 thin_A = mkA "dun" ;
 think_V = denken_V ;
 throw_V2 = mkV2 "gooien" ;
-tie_V2 = mkV2 "banden" ;
+tie_V2 = mkV2 binden_V ;
 tongue_N = mkN "tong" utrum ;
 tooth_N = mkN "tand" utrum ;
 train_N = mkN "trein" utrum ;
@@ -338,8 +338,8 @@ university_N = mkN "universiteit" utrum ;
 village_N = mkN "dorp" neuter ;
 vomit_V = mkV "braken" ;
 wait_V2 = mkV2 (mkV "wachten") (mkPrep "op") ;
-walk_V = mkV "lopen" ;
-war_N = mkN "oorlog" utrum ;
+walk_V = lopen_V ;
+war_N = mkN "oorlog" "oorlogen" utrum ;
 wash_V2 = mkV2 wassen_V ;
 watch_V2 = mkV2 kijken_V (mkPrep "naar") ;
 water_N = mkN "water" neuter ;