a bunch of changes in DictEng and DictEngBul

2026-05-26 19:28:54 -06:00 · 2013-05-23 09:29:59 +00:00
parent 9a6b504407
commit 0a66a17e98
3 changed files with 1474 additions and 1537 deletions
--- a/lib/src/bulgarian/DictEngBul.gf
+++ b/lib/src/bulgarian/DictEngBul.gf
--- a/lib/src/english/DictEng.gf
+++ b/lib/src/english/DictEng.gf
@@ -817,7 +817,8 @@ lin administer_V2 = mkV2 (mkV "administer" "administers" "administered" "adminis
 lin administrable_A = mkA "administrable" ;
 lin administration_N = mkN "administration" "administrations";
 lin administrative_A = compoundA (mkA "administrative");
-lin administrator_N = mkN "administrator" "administrators";
+lin administratorFem_N = mkN feminine (mkN "administrator" "administrators");
 lin administratorMasc_N = mkN masculine (mkN "administrator" "administrators");
 lin administrivia_N = mkN "administrivia" ;
 lin admirability_N = mkN "admirability" ;
 lin admirable_A = compoundA (mkA "admirable");
@@ -958,7 +959,8 @@ lin advise_V = mkV "advise" "advises" "advised" "advised" "advising";
 lin advise_V2 = mkV2 (mkV "advise" "advises" "advised" "advised" "advising");
 lin advise_VS = mkVS (mkV "advise" "advises" "advised" "advised" "advising");
 lin advisee_N = mkN "advisee" ;
-lin adviser_N = mkN "adviser" "advisers";
+lin adviserMasc_N = mkN masculine (mkN "adviser" "advisers");
 lin adviserFem_N = mkN feminine (mkN "adviser" "advisers");
 lin advisory_A = compoundA (mkA "advisory");
 lin advisory_N = mkN "advisory" ;
 lin advocacy_N = mkN "advocacy" ;
@@ -1118,7 +1120,8 @@ lin africanMasc_N = mkN masculine (mkN "African" "Africans");
 lin african_A = compoundA (mkA "African");
 lin afrikaans_N = mkN "Afrikaans" ;
 lin afrikaner_A = compoundA (mkA "Afrikaner");
-lin afrikaner_N = mkN "Afrikaner" "Afrikaners";
+lin afrikanerFem_N = mkN feminine (mkN "Afrikaner" "Afrikaners");
 lin afrikanerMasc_N = mkN masculine (mkN "Afrikaner" "Afrikaners");
 lin afro_americanFem_N = mkN feminine (mkN "Afro - American" "Afro - Americans");
 lin afro_americanMasc_N = mkN masculine (mkN "Afro - American" "Afro - Americans");
 lin afro_asian_A = compoundA (mkA "Afro - Asian");
@@ -1376,7 +1379,7 @@ lin airliner_N = mkN "airliner" "airliners";
 lin airlock_N = mkN "airlock" ;
 lin airmail_N = mkN "airmail" ;
 lin airmailer_N = mkN "airmailer" ;
-lin airman_N = mkN "airman" "airmen" {- FIXME: guessed plural form -};
+lin airman_N = mkN "airman" "airmen";
 lin airplane_N = mkN "airplane" "airplanes";
 lin airport_N = mkN "airport" "airports";
 lin airs_N = mkN "airs" ;
@@ -1541,7 +1544,8 @@ lin alicante_PN = mkPN "Alicante";
 lin alice_PN = mkPN "Alice";
 lin alidade_N = mkN "alidade" ;
 lin alien_A = compoundA (mkA "alien");
-lin alien_N = mkN "alien" "aliens";
+lin alienFem_N = mkN feminine (mkN "alien" "aliens");
 lin alienMasc_N = mkN masculine (mkN "alien" "aliens");
 lin alienable_A = mkA "alienable" ;
 lin alienage_N = mkN "alienage" ;
 lin alienate_V2 = mkV2 (mkV "alienate" "alienates" "alienated" "alienated" "alienating");
@@ -1732,8 +1736,7 @@ lin aloe_N = mkN "aloe" "aloes";
 lin aloes_N = mkN "aloes" ;
 lin aloft_Adv = mkAdv "aloft";
 lin aloha_N = mkN "aloha" ;
-lin alone_A = compoundA (mkA "alone");
+lin alone_A = irregAdv (compoundA (mkA "alone")) "alone";
 lin alone_Adv = mkAdv "alone";
 lin aloneness_N = mkN "aloneness" ;
 lin along_Adv = mkAdv "along";
 lin along_Prep = mkPrep "along";
@@ -3137,7 +3140,7 @@ lin araucaria_N = mkN "araucaria" ;
 lin arbiter_N = mkN "arbiter" "arbiters";
 lin arbitrable_A = mkA "arbitrable" ;
 lin arbitrage_N = mkN "arbitrage" ;
-lin arbitrageur_N = mkN "arbitrageur" ;
+lin arbitrageur_N = mkN (variants {"arbitrager"; "arbitrageur"}) ;
 lin arbitral_A = mkA "arbitral" ;
 lin arbitrament_N = mkN "arbitrament" "arbitraments";
 lin arbitrary_A = compoundA (mkA "arbitrary");
@@ -3372,7 +3375,6 @@ lin aroma_N = mkN "aroma" "aromas";
 lin aromatherapy_N = mkN "aromatherapy" ;
 lin aromatic_A = compoundA (mkA "aromatic");
 lin arose_V2 = mkV2 (mkV "arose");
 lin arose_VS = mkVS (mkV "arose");
 lin around_AdN = mkAdN "around";
 lin around_Adv = mkAdv "around";
 lin around_Prep = mkPrep "around";
@@ -6901,6 +6903,7 @@ lin bother_N = mkN "bother" ;
 lin bother_V = mkV "bother" "bothers" "bothered" "bothered" "bothering";
 lin bother_V2 = mkV2 (mkV "bother" "bothers" "bothered" "bothered" "bothering");
 lin bother_V2V = mkV2V (mkV "bother" "bothers" "bothered" "bothered" "bothering") noPrep to_Prep ;
 lin bother_VV = mkVV (mkV "bother" "bothers" "bothered" "bothered" "bothering") ;
 lin bothersome_A = compoundA (mkA "bothersome");
 lin botonee_A = mkA "botonee" ;
 lin botryoid_A = mkA "botryoid" ;
@@ -7445,8 +7448,6 @@ lin broil_V = mkV "broil" "broils" "broiled" "broiled" "broiling";
 lin broil_V2 = mkV2 (mkV "broil" "broils" "broiled" "broiled" "broiling");
 lin broiler_N = mkN "broiler" "broilers";
 lin broke_A = compoundA (mkA "broke");
 lin broke_VA = mkVA (mkV "broke");
 lin broke_VS = mkVS (mkV "broke");
 lin broken_hearted_A = compoundA (mkA "broken - hearted");
 lin brokenhearted_A = mkA "brokenhearted" ;
 lin broker_N = mkN "broker" "brokers";
@@ -7505,7 +7506,6 @@ lin brotherly_Adv = mkAdv "brotherly" ;
 lin brotula_N = mkN "brotula" ;
 lin brougham_N = mkN "brougham" "broughams";
 lin brought_V = mkV "brought";
 lin brought_VS = mkVS (mkV "brought");
 lin broughton_PN = mkPN "Broughton";
 lin brouhaha_N = mkN "brouhaha" "brouhahas";
 lin brow_N = mkN "brow" "brows";
@@ -7822,9 +7822,9 @@ lin burdenless_A = mkA "burdenless" ;
 lin burdensome_A = compoundA (mkA "burdensome");
 lin burdensomeness_N = mkN "burdensomeness" ;
 lin burdock_N = mkN "burdock" "burdocks";
-lin bureau_N = mkN "bureau" "bureaux" {- FIXME: guessed plural form -};
+lin bureau_N = mkN "bureau" "bureaux";
 lin bureaucracy_N = mkN "bureaucracy" "bureaucracies";
-lin bureaucrat_N = mkN "bureaucrat" "bureaucrats";
+lin bureaucrat_N = mkN human (mkN "bureaucrat" "bureaucrats");
 lin bureaucratic_A = compoundA (mkA "bureaucratic");
 lin bureaucratically_Adv = mkAdv "bureaucratically";
 lin burette_N = mkN "burette" "burettes";
@@ -8259,7 +8259,6 @@ lin call_V2 = mkV2 (mkV "call" "calls" "called" "called" "calling");
 lin call_V2A = mkV2A (mkV "call" "calls" "called" "called" "calling") noPrep;
 lin call_V2V = mkV2V (mkV "call" "calls" "called" "called" "calling") noPrep to_Prep ;
 lin call_V3 = mkV3 (mkV "call" "calls" "called" "called" "calling");
 lin call_VS = mkVS (mkV "call" "calls" "called" "called" "calling");
 lin call_box_N = mkN "call - box" "call - boxes";
 lin call_girl_N = mkN "call - girl" "call - girls";
 lin call_over_N = mkN "call - over" "call - overs";
@@ -8446,7 +8445,8 @@ lin candescent_A = mkA "candescent" ;
 lin candid_A = compoundA (mkA "candid");
 lin candida_N = mkN "candida" ;
 lin candidacy_N = mkN "candidacy";
-lin candidate_N = mkN "candidate" "candidates";
+lin candidateMasc_N = mkN masculine (mkN "candidate" "candidates");
 lin candidateFem_N = mkN feminine (mkN "candidate" "candidates");
 lin candidature_N = mkN "candidature" "candidatures";
 lin candidiasis_N = mkN "candidiasis" ;
 lin candle_N = mkN "candle" "candles";
@@ -8893,7 +8893,8 @@ lin cartography_N = mkN "cartography" ;
 lin carton_N = mkN "carton" "cartons";
 lin cartoon_N = mkN "cartoon" "cartoons";
 lin cartoon_V2 = mkV2 (mkV "cartoon" "cartoons" "cartooned" "cartooned" "cartooning");
-lin cartoonist_N = mkN "cartoonist" "cartoonists";
+lin cartoonistMasc_N = mkN masculine (mkN "cartoonist" "cartoonists");
 lin cartoonistFem_N = mkN feminine (mkN "cartoonist" "cartoonists");
 lin cartouche_N = mkN "cartouche" ;
 lin cartridge_N = mkN "cartridge" "cartridges";
 lin cartridge_belt_N = mkN "cartridge - belt" "cartridge - belts";
@@ -9214,8 +9215,7 @@ lin cdre_PN = mkPN "Cdre";
 lin cease_N = mkN "cease" "ceases";
 lin cease_V = mkV "cease" "ceases" "ceased" "ceased" "ceasing";
 lin cease_V2 = mkV2 (mkV "cease" "ceases" "ceased" "ceased" "ceasing");
-lin cease_V2V = mkV2V (mkV "cease" "ceases" "ceased" "ceased" "ceasing") noPrep to_Prep ;
+lin cease_V2V = mkV2V (mkV "cease" "ceases" "ceased" "ceased" "ceasing") noPrep to_Prep;
 lin cease_VS = mkVS (mkV "cease" "ceases" "ceased" "ceased" "ceasing");
 lin cease_fire_N = mkN "cease - fire" "cease - fires";
 lin ceaseless_A = compoundA (mkA "ceaseless");
 lin cecal_A = mkA "cecal" ;
@@ -9546,7 +9546,6 @@ lin chanar_N = mkN "chanar" ;
 lin chance_N = mkN "chance" "chances";
 lin chance_V = mkV "chance" "chances" "chanced" "chanced" "chancing";
 lin chance_V2 = mkV2 (mkV "chance" "chances" "chanced" "chanced" "chancing");
 lin chance_VS = mkVS (mkV "chance" "chances" "chanced" "chanced" "chancing");
 lin chancel_N = mkN "chancel" "chancels";
 lin chancellery_N = mkN "chancellery" "chancelleries";
 lin chancellor_N = mkN "chancellor" "chancellors";
@@ -10367,7 +10366,8 @@ lin citadel_N = mkN "citadel" "citadels";
 lin citation_N = mkN "citation" "citations";
 lin cite_V2 = mkV2 (mkV "cite" "cites" "cited" "cited" "citing");
 lin citified_A = mkA "citified" ;
-lin citizen_N = mkN "citizen" "citizens";
+lin citizenFem_N = mkN feminine (mkN "citizen" "citizens");
 lin citizenMasc_N = mkN masculine (mkN "citizen" "citizens");
 lin citizenry_N = mkN "citizenry" ;
 lin citizenship_N = mkN "citizenship" "citizenships";
 lin citrange_N = mkN "citrange" ;
@@ -14191,7 +14191,8 @@ lin dasyure_N = mkN "dasyure" ;
 lin data_N = mkN "data" "data";
 lin database_N = mkN "database";
 lin datable_A = compoundA (mkA "datable");
-lin date_N = mkN "date" "dates";
+lin date_1_N = mkN "date" "dates";
 lin date_7_N = mkN "date" "dates";
 lin date_V = mkV "date" "dates" "dated" "dated" "dating";
 lin date_V2 = mkV2 (mkV "date" "dates" "dated" "dated" "dating");
 lin dateless_A = compoundA (mkA "dateless");
@@ -14738,7 +14739,6 @@ lin delaware_PN = mkPN "Delaware";
 lin delay_N = mkN "delay" "delays";
 lin delay_V = mkV "delay" "delays" "delayed" "delayed" "delaying";
 lin delay_V2 = mkV2 (mkV "delay" "delays" "delayed" "delayed" "delaying");
 lin delay_VS = mkVS (mkV "delay" "delays" "delayed" "delayed" "delaying");
 lin delayed_action_A = compoundA (mkA "delayed - action");
 lin delayed_action_N = mkN "delayed - action" ;
 lin delayer_N = mkN "delayer" ;
@@ -15231,7 +15231,6 @@ lin detachable_A = compoundA (mkA "detachable");
 lin detachment_N = mkN "detachment" "detachments";
 lin detail_N = mkN "detail" "details";
 lin detail_V2 = mkV2 (mkV "detail" "details" "detailed" "detailed" "detailing");
 lin details_N = mkN "details" ;
 lin detain_V2 = mkV2 (mkV "detain" "detains" "detained" "detained" "detaining");
 lin detainee_N = mkN "detainee" "detainees";
 lin detect_V2 = mkV2 (mkV "detect" "detects" "detected" "detected" "detecting");
@@ -15321,7 +15320,6 @@ lin deviation_N = mkN "deviation" "deviations";
 lin deviationism_N = mkN "deviationism" ;
 lin deviationist_N = mkN "deviationist" "deviationists";
 lin device_N = mkN "device" "devices";
 lin devices_N = mkN "devices" ;
 lin devil_N = mkN "devil" "devils";
 lin devil_V = mkV "devil" "devils" "devilled" "devilled" "devilling";
 lin devil_V2 = mkV2 (mkV "devil" "devils" "devilled" "devilled" "devilling");
@@ -15749,8 +15747,7 @@ lin diploma_N = mkN "diploma" "diplomas";
 lin diplomacy_N = mkN "diplomacy" ;
 lin diplomat_N = mkN "diplomat" "diplomats";
 lin diplomate_N = mkN "diplomate" ;
-lin diplomatic_A = compoundA (mkA "diplomatic");
+lin diplomatic_A = irregAdv (compoundA (mkA "diplomatic")) "diplomatically";
 lin diplomatically_Adv = mkAdv "diplomatically";
 lin diplomatist_N = mkN "diplomatist" "diplomatists";
 lin diplopia_N = mkN "diplopia" ;
 lin diplotene_N = mkN "diplotene" ;
@@ -15878,7 +15875,6 @@ lin disciplinary_A = compoundA (mkA "disciplinary");
 lin discipline_N = mkN "discipline" "disciplines";
 lin discipline_V2 = mkV2 (mkV "discipline" "disciplines" "disciplined" "disciplined" "disciplining");
 lin disclaim_V2 = mkV2 (mkV "disclaim" "disclaims" "disclaimed" "disclaimed" "disclaiming");
 lin disclaim_VS = mkVS (mkV "disclaim");
 lin disclaimer_N = mkN "disclaimer" "disclaimers";
 lin disclose_V = mkV "disclose";
 lin disclose_V2 = mkV2 (mkV "disclose" "discloses" "disclosed" "disclosed" "disclosing");
@@ -16586,7 +16582,6 @@ lin donate_V = mkV "donate";
 lin donate_V2 = mkV2 (mkV "donate" "donates" "donated" "donated" "donating");
 lin donation_N = mkN "donation" "donations";
 lin doncaster_PN = mkPN "Doncaster";
 lin done_VA = mkVA (mkV "done");
 lin donegal_PN = mkPN "Donegal";
 lin donetsk_PN = mkPN "Donetsk";
 lin dong_N = mkN "dong" ;
@@ -17385,8 +17380,8 @@ lin dystrophy_N = mkN "dystrophy" ;
 lin dysuria_N = mkN "dysuria" ;
 lin e'en_Adv = mkAdv "e'en";
 lin e'er_Adv = mkAdv "e'er";
-lin e_N = mkN "e" ;
+lin e_mail_N = mkN "e-mail";
-lin each_Adv = mkAdv "each" ;
+lin each_Adv = mkAdv "each";
 lin each_Det = mkDeterminer singular "each";
 lin eager_A = compoundA (mkA "eager");
 lin eagerness_N = mkN "eagerness" ;
@@ -18225,7 +18220,6 @@ lin end_N = mkN "end" "ends";
 lin end_V = mkV "end" "ends" "ended" "ended" "ending";
 lin end_V2 = mkV2 (mkV "end" "ends" "ended" "ended" "ending");
 lin end_VA = mkVA (mkV "end" "ends" "ended" "ended" "ending");
 lin end_VS = mkVS (mkV "end" "ends" "ended" "ended" "ending");
 lin end_all_N = mkN "end - all" "IRREG";
 lin end_tail_V2 = mkV2 (mkV "end - tail");
 lin endameba_N = mkN "endameba" ;
@@ -18393,8 +18387,7 @@ lin enormity_N = mkN "enormity" "enormities";
 lin enormous_A = compoundA (mkA "enormous");
 lin enormousness_N = mkN "enormousness" ;
 lin enosis_N = mkN "enosis" ;
-lin enough_A = compoundA (mkA "enough");
+lin enough_A = irregAdv (compoundA (mkA "enough")) "enough";
 lin enough_Adv = mkAdv "enough";
 lin enough_N = mkN "enough" "enough";
 lin enplane_V = mkV "enplane" "enplanes" "enplaned" "enplaned" "enplaning";
 lin enplane_V2 = mkV2 (mkV "enplane" "enplanes" "enplaned" "enplaned" "enplaning");
@@ -18467,8 +18460,7 @@ lin enthronement_N = mkN "enthronement" "enthronements";
 lin enthuse_V = mkV "enthuse" "enthuses" "enthused" "enthused" "enthusing";
 lin enthusiasm_N = mkN "enthusiasm" ;
 lin enthusiast_N = mkN "enthusiast" "enthusiasts";
-lin enthusiastic_A = compoundA (mkA "enthusiastic");
+lin enthusiastic_A = irregAdv (compoundA (mkA "enthusiastic")) (variants {"enthusiastically"; "enthusiasticly"});
 lin enthusiastically_Adv = mkAdv "enthusiastically";
 lin entice_V2 = mkV2 (mkV "entice" "entices" "enticed" "enticed" "enticing");
 lin enticement_N = mkN "enticement" "enticements";
 lin entire_A = compoundA (mkA "entire");
@@ -19269,7 +19261,7 @@ lin execute_V2 = mkV2 (mkV "execute" "executes" "executed" "executed" "executing
 lin execution_N = mkN "execution" "executions";
 lin executioner_N = mkN "executioner" "executioners";
 lin executive_A = compoundA (mkA "executive");
-lin executive_N = mkN "executive" "executives";
+lin executive_N = mkN human (mkN "executive" "executives");
 lin executor_N = mkN "executor" "executors";
 lin executrix_N = mkN "executrix" "executrixes";
 lin exegesis_N = mkN "exegesis" ;
@@ -19758,7 +19750,6 @@ lin fail_N = mkN "fail" ;
 lin fail_V = mkV "fail";
 lin fail_V2 = mkV2 (mkV "fail");
 lin fail_V2V = mkV2V (mkV "fail") noPrep to_Prep ;
 lin fail_VS = mkVS (mkV "fail");
 lin fail_VV = mkVV (mkV "fail");
 lin fail_safe_A = compoundA (mkA "fail - safe");
 lin failing_N = mkN "failing" "failings";
@@ -19870,7 +19861,7 @@ lin fanciful_A = compoundA (mkA "fanciful");
 lin fancy_A = mkA "fancy" "fancier";
 lin fancy_N = mkN "fancy" "fancies";
 lin fancy_V2 = mkV2 (mkV "fancy" "fancies" "fancied" "fancied" "fancying");
-lin fancy_VS = mkVS (mkV "fancy");
+lin fancy_V3 = mkV3 (mkV "fancy");
 lin fancy_free_A = compoundA (mkA "fancy - free");
 lin fandango_N = mkN "fandango" "fandangos";
 lin fandom_N = mkN "fandom" ;
@@ -19895,6 +19886,7 @@ lin fantasy_N = mkN "fantasy" "fantasies";
 lin fantods_N = mkN "fantods" ;
 lin fao_N = mkN "fao" ;
 lin far_A = irregAdv (compoundA (mkA "far")) "far";
 lin far_AdA = mkAdA "far";
 lin far_V2 = mkV2 (mkV "far");
 lin far_famed_A = compoundA (mkA "far - famed");
 lin far_fetched_A = compoundA (mkA "far - fetched");
@@ -20164,8 +20156,6 @@ lin felixstowe_PN = mkPN "Felixstowe";
 lin fell_A = compoundA (mkA "fell");
 lin fell_N = mkN "fell" ;
 lin fell_V2 = mkV2 (mkV "fell" "fells" "felled" "felled" "felling");
 lin fell_V2V = mkV2V (mkV "fell") noPrep to_Prep ;
 lin fell_VA = mkVA (mkV "fell");
 lin fellah_N = mkN "fellah" (variants {"fellahin"; "fellaheen"});
 lin fellatio_N = mkN "fellatio" ;
 lin felloe_N = mkN "felloe" ;
@@ -21737,8 +21727,8 @@ lin freighter_N = mkN "freighter" "freighters";
 lin freightliner_N = mkN "freightliner" "freightliners";
 lin french_A = compoundA (mkA "French");
 lin french_N = mkN "french" ;
-lin frenchman_N = mkN "frenchman" "frenchmen";
+lin frenchman_N = mkN masculine (mkN "frenchman" "frenchmen");
-lin frenchwoman_N = mkN "frenchwoman" "frenchwomen";
+lin frenchwoman_N = mkN feminine (mkN "frenchwoman" "frenchwomen");
 lin frenetic_A = compoundA (mkA "frenetic");
 lin frenzied_A = compoundA (mkA "frenzied");
 lin frenzy_N = mkN "frenzy" ;
@@ -22120,7 +22110,8 @@ lin futile_A = compoundA (mkA "futile");
 lin futility_N = mkN "futility" "futilities";
 lin futon_N = mkN "futon" ;
 lin future_A = compoundA (mkA "future");
-lin future_N = mkN "future" "futures";
+lin future_1_N = mkN "future" "futures";
 lin future_3_N = mkN "future" "futures";
 lin futureless_A = compoundA (mkA "futureless");
 lin futurism_N = mkN "futurism" ;
 lin futurist_N = mkN "futurist" "futurists";
@@ -24014,7 +24005,6 @@ lin guru_N = mkN "guru" "gurus";
 lin gush_N = mkN "gush" "gushes";
 lin gush_V = mkV "gush" "gushes" "gushed" "gushed" "gushing";
 lin gusher_N = mkN "gusher" "gushers";
 lin gushes_VS = mkVS (mkV "gushes");
 lin gushingly_Adv = mkAdv "gushingly" ;
 lin gusset_N = mkN "gusset" "gussets";
 lin gusseted_A = compoundA (mkA "gusseted");
@@ -24467,9 +24457,6 @@ lin harasser_N = mkN "harasser" ;
 lin harassment_N = mkN "harassment" ;
 lin harbin_PN = mkPN "Harbin";
 lin harbinger_N = mkN "harbinger" "harbingers";
 lin harbor_N = mkN "harbor" ;
 lin harbor_V2 = mkV2 (mkV "harbor");
 lin harborage_N = mkN "harborage" ;
 lin harbour_N = mkN "harbour" "harbours";
 lin harbour_V = mkV "harbour" "harbours" "harboured" "harboured" "harbouring";
 lin harbour_V2 = mkV2 (mkV "harbour" "harbours" "harboured" "harboured" "harbouring");
@@ -24618,7 +24605,7 @@ lin hatchway_N = mkN "hatchway" "hatchways";
 lin hate_N = mkN "hate" "hates";
 lin hate_V2 = mkV2 (mkV "hate" "hates" "hated" "hated" "hating");
 lin hate_V2V = mkV2V (mkV "hate") noPrep to_Prep ;
-lin hate_VS = mkVS (mkV "hate");
+lin hate_VV = mkVV (mkV "hate");
 lin hateful_A = compoundA (mkA "hateful");
 lin hatefulness_N = mkN "hatefulness" ;
 lin hatemonger_N = mkN "hatemonger" ;
@@ -24711,7 +24698,6 @@ lin hazel_PN = mkPN "Hazel";
 lin hazelnut_N = mkN "hazelnut" ;
 lin haziness_N = mkN "haziness" ;
 lin hazy_A = mkA "hazy" "hazier";
 lin he_N = mkN "he" ;
 lin he_Pron = mkPron "he" "him" "his" "his" singular P3 masculine ;
 lin he_goat_N = mkN "he - goat" "he - goats";
 lin he_man_N = mkN "he - man" "he - men";
@@ -24751,7 +24737,7 @@ lin headmistress_N = mkN "headmistress" "headmistresses";
 lin headmistressship_N = mkN "headmistressship" ;
 lin headpiece_N = mkN "headpiece" "headpieces";
 lin headpin_N = mkN "headpin" ;
-lin headquarters_N = mkN "headquarters" ;
+lin headquarter_N = mkN "headquarter";
 lin headrace_N = mkN "headrace" ;
 lin headrest_N = mkN "headrest" "headrests";
 lin headroom_N = mkN "headroom" ;
@@ -24987,7 +24973,7 @@ lin helot_N = mkN "helot" "helots";
 lin help_N = mkN "help" "helps";
 lin help_V = mkV "help" "helps" "helped" "helped" "helping";
 lin help_V2 = mkV2 (mkV "help" "helps" "helped" "helped" "helping");
-lin help_V2V = mkV2V (mkV "help" "helps" "helped" "helped" "helping") noPrep to_Prep ;
+lin help_V2V = mkV2V (mkV "help" "helps" "helped" "helped" "helping") noPrep noPrep ;
 lin help_VS = mkVS (mkV "help" "helps" "helped" "helped" "helping");
 lin help_VV = mkVV (mkV "help" "helps" "helped" "helped" "helping");
 lin helper_N = mkN "helper" "helpers";
@@ -25132,7 +25118,6 @@ lin herd_V2 = mkV2 (mkV "herd" "herds" "herded" "herded" "herding");
 lin herder_N = mkN "herder" ;
 lin herdsman_N = mkN "herdsman" "herdsmen";
 lin here_Adv = mkAdv "here";
 lin here_N = mkN "here" ;
 lin hereabout_Adv = mkAdv "hereabout" ;
 lin hereabouts_Adv = mkAdv "hereabouts";
 lin hereafter_Adv = mkAdv "hereafter";
@@ -25196,7 +25181,6 @@ lin hesitance_N = mkN "hesitance" "IRREG";
 lin hesitancy_N = mkN "hesitancy" ;
 lin hesitant_A = compoundA (mkA "hesitant");
 lin hesitate_V = mkV "hesitate" "hesitates" "hesitated" "hesitated" "hesitating";
 lin hesitate_VS = mkVS (mkV "hesitate" "hesitates" "hesitated" "hesitated" "hesitating");
 lin hesitate_VV = mkVV (mkV "hesitate" "hesitates" "hesitated" "hesitated" "hesitating");
 lin hesitatingly_Adv = mkAdv "hesitatingly";
 lin hesitation_N = mkN "hesitation" "hesitations";
@@ -25749,9 +25733,6 @@ lin honk_N = mkN "honk" "honks";
 lin honk_V = mkV "honk" "honks" "honked" "honked" "honking";
 lin honker_N = mkN "honker" ;
 lin honkytonk_N = mkN "honkytonk" ;
 lin honor_V2 = mkV2 (mkV "honor");
 lin honorable_A = mkA "honorable" ;
 lin honorableness_N = mkN "honorableness" ;
 lin honorarium_N = mkN "honorarium" "honorariums";
 lin honorary_A = compoundA (mkA "honorary");
 lin honoree_N = mkN "honoree" ;
@@ -25759,9 +25740,9 @@ lin honorific_A = compoundA (mkA "honorific");
 lin honorific_N = mkN "honorific" "honorifics";
 lin honoring_N = mkN "honoring" ;
 lin honour_N = mkN (variants {"honour"; "honor"});
-lin honour_V2 = mkV2 (mkV "honour" "honours" "honoured" "honoured" "honouring");
+lin honour_V2 = mkV2 (mkV (variants {"honour"; "honor"}));
-lin honourable_A = compoundA (mkA "honourable");
+lin honourable_A = compoundA (mkA (variants {"honourable"; "honorable"}));
-lin honours_N = mkN "honours" ;
+lin honourableness_N = mkN (variants {"honourableness"; "honorableness"});
 lin hoo_PN = mkPN "Hoo";
 lin hooch_N = mkN "hooch" ;
 lin hood_N = mkN "hood" "hoods";
@@ -27092,7 +27073,9 @@ lin in_Prep = mkPrep "in";
 lin in_addition_Adv = mkAdv "in addition";
 lin in_chief_A = compoundA (mkA "in - chief");
 lin in_fighting_N = mkN "in - fighting" ;
 lin in_general_Adv = mkAdv "in general";
 lin in_loco_parentis_Adv = mkAdv "in loco parentis";
 lin in_particular_Adv = mkAdv "in particular";
 lin in_patient_N = mkN "in - patient" "in - patients";
 lin in_service_A = compoundA (mkA "in - service");
 lin in_situ_Adv = mkAdv "in situ";
@@ -27306,7 +27289,9 @@ lin incorruptness_N = mkN "incorruptness" ;
 lin increase_N = mkN "increase" "increases";
 lin increase_V = mkV "increase" "increases" "increased" "increased" "increasing";
 lin increase_V2 = mkV2 (mkV "increase" "increases" "increased" "increased" "increasing");
 lin increasingly_AdA = mkAdA "increasingly";
 lin increasingly_Adv = mkAdv "increasingly";
 lin increasingly_AdV = mkAdV "increasingly";
 lin incredibility_N = mkN "incredibility" ;
 lin incredible_A = compoundA (mkA "incredible");
 lin incredulity_N = mkN "incredulity" ;
@@ -27396,8 +27381,8 @@ lin indexless_A = mkA "indexless" ;
 lin india_PN = mkPN "India";
 lin india_rubber_N = mkN "india - rubber" "india - rubbers";
 lin indiaman_N = mkN "indiaman" "indiamen";
-lin indian_A = compoundA (mkA "indian");
+lin indian_A = compoundA (mkA "Indian");
-lin indian_N = mkN "indian" "indians";
+lin indian_N = mkN "Indian" "Indians";
 lin indiana_PN = mkPN "Indiana";
 lin indianapolis_PN = mkPN "Indianapolis";
 lin indicate_V = mkV "indicate";
@@ -28122,6 +28107,7 @@ lin interdict_V2 = mkV2 (mkV "interdict" "interdicts" "interdicted" "interdicted
 lin interdiction_N = mkN "interdiction" "interdictions";
 lin interdisciplinary_A = compoundA (mkA "interdisciplinary");
 lin interest_N = mkN "interest" "interests";
 lin interest_4_N = mkN "interest" "interests";
 lin interest_V = mkV "interest";
 lin interest_V2 = mkV2 (mkV "interest" "interests" "interested" "interested" "interesting");
 lin interestedness_N = mkN "interestedness";
@@ -28526,8 +28512,8 @@ lin iris_N = mkN "iris" "irises";
 lin iris_PN = mkPN "Iris";
 lin irish_A = compoundA (mkA "irish");
 lin irish_N = mkN "irish" ;
-lin irishman_N = mkN "irishman" "irishmen";
+lin irishman_N = mkN masculine (mkN "irishman" "irishmen");
-lin irishwoman_N = mkN "irishwoman" "irishwomen";
+lin irishwoman_N = mkN feminine (mkN "irishwoman" "irishwomen");
 lin iritic_A = mkA "iritic" ;
 lin iritis_N = mkN "iritis" ;
 lin irk_V2 = mkV2 (mkV "irk" "irks" "irked" "irked" "irking");
@@ -28961,8 +28947,7 @@ lin jetty_N = mkN "jetty" "jetties";
 lin jew_N = mkN "Jew" "Jews";
 lin jewel_N = mkN "jewel" "jewels";
 lin jewel_V2 = mkV2 (mkV "jewel" "jewels" "jewelled" "jewelled" "jewelling");
-lin jeweler_N = mkN "jeweler" ;
+lin jeweller_N = mkN (variants {"jeweller"; "jeweler"});
 lin jeweller_N = mkN "jeweller" "jewellers";
 lin jewellery_N = mkN "jewellery" ;
 lin jewelry_N = mkN "jewelry" ;
 lin jewelweed_N = mkN "jewelweed" ;
@@ -29207,7 +29192,7 @@ lin julian_PN = mkPN "Julian";
 lin julie_PN = mkPN "Julie";
 lin julienne_N = mkN "julienne" ;
 lin juliet_PN = mkPN "Juliet";
-lin july_N = mkN "July" "Julys";
+lin july_PN = mkPN "July";
 lin jumble_N = mkN "jumble" "jumbles";
 lin jumble_V = mkV "jumble" "jumbles" "jumbled" "jumbled" "jumbling";
 lin jumble_V2 = mkV2 (mkV "jumble" "jumbles" "jumbled" "jumbled" "jumbling");
@@ -29894,7 +29879,8 @@ lin labdanum_N = mkN "labdanum" ;
 lin label_N = mkN "label" "labels";
 lin label_V = mkV "label";
 lin label_V2 = mkV2 (mkV "label" (variants {"labelled"; "labeled"}));
-lin label_VS = mkVS (mkV "label");
+lin label_V2A = mkV2A (mkV "label" (variants {"labelled"; "labeled"})) noPrep;
 lin label_V3 = mkV3 (mkV "label" (variants {"labelled"; "labeled"}));
 lin labeled_A = mkA "labeled" ;
 lin labetalol_N = mkN "labetalol" ;
 lin labial_A = compoundA (mkA "labial");
@@ -30340,10 +30326,10 @@ lin launder_V = mkV "launder" "launders" "laundered" "laundered" "laundering";
 lin launder_V2 = mkV2 (mkV "launder" "launders" "laundered" "laundered" "laundering");
 lin launderette_N = mkN "launderette" "launderettes";
 lin laundering_N = mkN "laundering" ;
-lin laundress_N = mkN "laundress" "laundresses";
+lin laundress_N = mkN feminine (mkN "laundress" "laundresses");
 lin laundry_N = mkN "laundry" "laundries";
-lin laundryman_N = mkN "laundryman" "laundrymen";
+lin laundryman_N = mkN masculine (mkN "laundryman" "laundrymen");
-lin laundrywoman_N = mkN "laundrywoman" "laundrywomen";
+lin laundrywoman_N = mkN feminine (mkN "laundrywoman" "laundrywomen");
 lin laura_PN = mkPN "Laura";
 lin laureate_A = compoundA (mkA "laureate");
 lin laureate_N = mkN "laureate" "laureates";
@@ -30554,7 +30540,6 @@ lin leeway_N = mkN "leeway" ;
 lin leflunomide_N = mkN "leflunomide" ;
 lin left_A = irregAdv (mkA "left") "left";
 lin left_N = mkN "left" ;
 lin left_VS = mkVS (mkV "left");
 lin left_hand_A = compoundA (mkA "left - hand");
 lin left_handed_A = compoundA (mkA "left - handed");
 lin left_wing_N = mkN "left - wing" "left - wings";
@@ -31066,6 +31051,7 @@ lin limewater_N = mkN "limewater" ;
 lin limey_N = mkN "limey" "limeys";
 lin limit_N = mkN "limit" "limits";
 lin limit_V2 = mkV2 (mkV "limit" "limits" "limited" "limited" "limiting");
 lin limit_V2V = mkV2V (mkV "limit" "limits" "limited" "limited" "limiting") noPrep to_Prep;
 lin limitation_N = mkN "limitation" "limitations";
 lin limitedly_Adv = mkAdv "limitedly" ;
 lin limiter_N = mkN "limiter" ;
@@ -31545,8 +31531,7 @@ lin loneliness_N = mkN "loneliness" ;
 lin lonely_A = mkA "lonely" "lonelier";
 lin loner_N = mkN "loner" ;
 lin lonesome_A = compoundA (mkA "lonesome");
-lin long_A = mkA "long" "longer";
+lin long_A = irregAdv (mkA "long" "longer") "long";
 lin long_Adv = mkAdv "long";
 lin long_N = mkN "long" "longs";
 lin long_V = mkV "long" "longs" "longed" "longed" "longing";
 lin long_distance_A = compoundA (mkA "long - distance");
@@ -32232,7 +32217,7 @@ lin mailing_N = mkN "mailing" ;
 lin mailing_card_N = mkN "mailing - card" "mailing - cards";
 lin mailing_list_N = mkN "mailing - list" "mailing - lists";
 lin maillot_N = mkN "maillot" ;
-lin mailman_N = mkN "mailman" "mailmen" {- FIXME: guessed plural form -};
+lin mailman_N = mkN "mailman" "mailmen";
 lin mailsorter_N = mkN "mailsorter" ;
 lin maim_V2 = mkV2 (mkV "maim" "maims" "maimed" "maimed" "maiming");
 lin main_A = compoundA (mkA "main");
@@ -32774,7 +32759,6 @@ lin marumi_N = mkN "marumi" ;
 lin marupa_N = mkN "marupa" ;
 lin marvel_N = mkN "marvel" "marvels";
 lin marvel_V = mkV "marvel" "marvels" "marvelled" "marvelled" "marvelling";
 lin marvel_VS = mkVS (mkV "marvel" "marvels" "marvelled" "marvelled" "marvelling");
 lin marvellous_A = compoundA (mkA "marvellous");
 lin marvelous_A = compoundA (mkA "marvelous");
 lin marxism_N = mkN "marxism" ;
@@ -32916,7 +32900,8 @@ lin maternalistic_A = mkA "maternalistic" ;
 lin maternity_N = mkN "maternity" ;
 lin matey_A = compoundA (mkA "matey");
 lin mathematical_A = compoundA (mkA "mathematical");
-lin mathematician_N = mkN "mathematician" "mathematicians";
+lin mathematicianMasc_N = mkN masculine (mkN "mathematician" "mathematicians");
 lin mathematicianFem_N = mkN feminine (mkN "mathematician" "mathematicians");
 lin mathematics_N = mkN "mathematics" "mathematics";
 lin maths_N = mkN "maths" "maths";
 lin matinee_N = mkN "matinée" "matinées";
@@ -34970,7 +34955,8 @@ lin movable_A = compoundA (mkA "movable");
 lin move_N = mkN "move" "moves";
 lin move_V = mkV "move" "moves" "moved" "moved" "moving";
 lin move_V2 = mkV2 (mkV "move" "moves" "moved" "moved" "moving");
-lin move_V2V = mkV2V (mkV "move" "moves" "moved" "moved" "moving") noPrep to_Prep ;
+lin move_V2A = mkV2A (mkV "move" "moves" "moved" "moved" "moving") noPrep;
 lin move_V2V = mkV2V (mkV "move" "moves" "moved" "moved" "moving") noPrep to_Prep;
 lin move_VV = mkVV (mkV "move" "moves" "moved" "moved" "moving") ;
 lin movement_N = mkN "movement" "movements";
 lin mover_N = mkN "mover" "movers";
@@ -37229,7 +37215,8 @@ lin offence_N = mkN "offence" "offences";
 lin offenceless_A = compoundA (mkA "offenceless");
 lin offend_V = mkV "offend" "offends" "offended" "offended" "offending";
 lin offend_V2 = mkV2 (mkV "offend" "offends" "offended" "offended" "offending");
-lin offender_N = mkN "offender" "offenders";
+lin offenderMasc_N = mkN masculine (mkN "offender" "offenders");
 lin offenderFem_N = mkN feminine (mkN "offender" "offenders");
 lin offense_N = mkN "offense" ;
 lin offenseless_A = mkA "offenseless" ;
 lin offensive_A = compoundA (mkA "offensive");
@@ -37621,7 +37608,6 @@ lin opsonin_N = mkN "opsonin" ;
 lin opsonization_N = mkN "opsonization" ;
 lin opt_V = mkV "opt" "opts" "opted" "opted" "opting";
 lin opt_V2V = mkV2V (mkV "opt" "opts" "opted" "opted" "opting") noPrep to_Prep ;
 lin opt_VS = mkVS (mkV "opt" "opts" "opted" "opted" "opting");
 lin opt_VV = mkVV (mkV "opt" "opts" "opted" "opted" "opting");
 lin optative_A = compoundA (mkA "optative");
 lin optative_N = mkN "optative" "optatives";
@@ -39383,7 +39369,7 @@ lin pay_claim_N = mkN "pay - claim" "pay - claims";
 lin pay_packet_N = mkN "pay - packet" "pay - packets";
 lin pay_station_N = mkN "pay - station" "pay - stations";
 lin payable_A = compoundA (mkA "payable");
-lin payables_N = mkN "payables" ;
+lin payable_N = mkN "payable" ;
 lin payback_N = mkN "payback" ;
 lin paycheck_N = mkN "paycheck" ;
 lin payday_N = mkN "payday" "paydays";
@@ -41227,7 +41213,7 @@ lin plutonium_N = mkN "plutonium" ;
 lin ply_N = mkN "ply" "ply";
 lin ply_V = mkV "ply" "plies" "plied" "plied" "plying";
 lin ply_V2 = mkV2 (mkV "ply" "plies" "plied" "plied" "plying");
-lin ply_VS = mkVS (mkV "ply" "plies" "plied" "plied" "plying");
+lin ply_V2A = mkV2A (mkV "ply" "plies" "plied" "plied" "plying") noPrep;
 lin plymouth_PN = mkPN "Plymouth";
 lin plywood_N = mkN "plywood" ;
 lin pneumatic_A = compoundA (mkA "pneumatic");
@@ -41537,7 +41523,6 @@ lin poncho_N = mkN "poncho" "ponchos";
 lin pond_N = mkN "pond" "ponds";
 lin ponder_V = mkV "ponder" "ponders" "pondered" "pondered" "pondering";
 lin ponder_V2 = mkV2 (mkV "ponder" "ponders" "pondered" "pondered" "pondering");
 lin ponder_VS = mkVS (mkV "ponder" "ponders" "pondered" "pondered" "pondering");
 lin ponderable_A = compoundA (mkA "ponderable");
 lin ponderosa_N = mkN "ponderosa" ;
 lin ponderous_A = compoundA (mkA "ponderous");
@@ -42700,7 +42685,8 @@ lin program_V2V = mkV2V (mkV "program") noPrep to_Prep ;
 lin programma_N = mkN "programma" ;
 lin programme_N = mkN "programme" "programmes";
 lin programme_V2 = mkV2 (mkV "programme" "programmes" "programmed" "programmed" "programming");
-lin programmer_N = mkN "programmer" "programmers";
+lin programmerFem_N = mkN feminine (mkN "programmer" "programmers");
 lin programmerMasc_N = mkN masculine (mkN "programmer" "programmers");
 lin programming_N = mkN "programming" ;
 lin progress_N = mkN "progress" "progresses";
 lin progress_V = mkV "progress" "progresses" "progressed" "progressed" "progressing";
@@ -42713,7 +42699,6 @@ lin progressivism_N = mkN "progressivism" ;
 lin progymnosperm_N = mkN "progymnosperm" ;
 lin prohibit_V = mkV "prohibit";
 lin prohibit_V2 = mkV2 (mkV "prohibit" "prohibits" "prohibited" "prohibited" "prohibiting");
 lin prohibit_VS = mkVS (mkV "prohibit");
 lin prohibition_N = mkN "prohibition" "prohibitions";
 lin prohibitionist_N = mkN "prohibitionist" "prohibitionists";
 lin prohibitive_A = compoundA (mkA "prohibitive");
@@ -43923,7 +43908,6 @@ lin quoits_N = mkN "quoits" ;
 lin quonset_N = mkN "quonset" "quonsets";
 lin quorum_N = mkN "quorum" "quorums";
 lin quot_V = mkV "quot";
 lin quot_VS = mkVS (mkV "quot");
 lin quota_N = mkN "quota" "quotas";
 lin quotability_N = mkN "quotability" ;
 lin quotable_A = compoundA (mkA "quotable");
@@ -44601,7 +44585,7 @@ lin receding_N = mkN "receding" ;
 lin receipt_N = mkN "receipt" "receipts";
 lin receipt_V2 = mkV2 (mkV "receipt" "receipts" "receipted" "receipted" "receipting");
 lin receivable_A = compoundA (mkA "receivable");
-lin receivables_N = mkN "receivables" ;
+lin receivable_N = mkN "receivable" ;
 lin receive_V = mkV "receive" "receives" "received" "received" "receiving";
 lin receive_V2 = mkV2 (mkV "receive" "receives" "received" "received" "receiving");
 lin receiver_N = mkN "receiver" "receivers";
@@ -44674,7 +44658,8 @@ lin recoding_N = mkN "recoding" ;
 lin recognition_N = mkN "recognition" ;
 lin recognizable_A = compoundA (mkA "recognizable");
 lin recognizance_N = mkN "recognizance" "recognizances";
-lin recognize_V2 = mkV2 (mkV "recognize" "recognizes" "recognized" "recognized" "recognizing");
+lin recognize_1_V2 = mkV2 (mkV "recognize" "recognizes" "recognized" "recognized" "recognizing");
 lin recognize_4_V2 = mkV2 (mkV "recognize" "recognizes" "recognized" "recognized" "recognizing");
 lin recognize_VS = mkVS (mkV "recognize");
 lin recoil_N = mkN "recoil" "recoils";
 lin recoil_V = mkV "recoil" "recoils" "recoiled" "recoiled" "recoiling";
@@ -44998,7 +44983,6 @@ lin regalia_N = mkN "regalia" ;
 lin regard_N = mkN "regard" "regards";
 lin regard_V = mkV "regard";
 lin regard_V2 = mkV2 (mkV "regard" "regards" "regarded" "regarded" "regarding");
 lin regard_VS = mkVS (mkV "regard");
 lin regardful_A = compoundA (mkA "regardful");
 lin regardless_A = compoundA (mkA "regardless");
 lin regardless_Adv = mkAdv "regardless" ;
@@ -45133,10 +45117,9 @@ lin relapse_N = mkN "relapse" "relapses";
 lin relapse_V = mkV "relapse" "relapses" "relapsed" "relapsed" "relapsing";
 lin relate_V = mkV "relate" "relates" "related" "related" "relating";
 lin relate_V2 = mkV2 (mkV "relate" "relates" "related" "related" "relating");
-lin relatedness_N = mkN "relatedness" ;
+lin relatedness_N = mkN "relatedness";
 lin relation_N = mkN "relation" "relations";
-lin relational_A = mkA "relational" ;
+lin relational_A = mkA "relational";
 lin relations_N = mkN "relations" ;
 lin relationship_N = mkN "relationship" "relationships";
 lin relative_A = compoundA (mkA "relative");
 lin relative_N = mkN "relative" "relatives";
@@ -45186,7 +45169,6 @@ lin relinquishment_N = mkN "relinquishment" ;
 lin reliquary_N = mkN "reliquary" "reliquaries";
 lin relish_N = mkN "relish" "relishes";
 lin relish_V2 = mkV2 (mkV "relish" "relishes" "relished" "relished" "relishing");
 lin relish_VS = mkVS (mkV "relish");
 lin relistening_N = mkN "relistening" ;
 lin relive_V2 = mkV2 (mkV "relive" "relives" "relived" "relived" "reliving");
 lin reliving_N = mkN "reliving" ;
@@ -45278,7 +45260,6 @@ lin renascent_A = compoundA (mkA "renascent");
 lin rend_V2 = mkV2 (mkV "rend" "IRREG" "IRREG" "IRREG" "IRREG");
 lin render_N = mkN "render" ;
 lin render_V2 = mkV2 (mkV "render" "renders" "rendered" "rendered" "rendering");
 lin render_VS = mkVS (mkV "render");
 lin rendering_N = mkN "rendering" "renderings";
 lin rendezvous_N = mkN "rendezvous" "rendezvous";
 lin rendezvous_V = mkV "rendezvous" "IRREG" "IRREG" "IRREG" "IRREG";
@@ -45651,7 +45632,7 @@ lin responsiveness_N = mkN "responsiveness" ;
 lin rest_N = mkN "rest" "rests";
 lin rest_V = mkV "rest" "rests" "rested" "rested" "resting";
 lin rest_V2 = mkV2 (mkV "rest" "rests" "rested" "rested" "resting");
-lin rest_VS = mkVS (mkV "rest" "rests" "rested" "rested" "resting");
+lin rest_VA = mkVA (mkV "rest" "rests" "rested" "rested" "resting");
 lin rest_cure_N = mkN "rest - cure" "rest - cures";
 lin rest_day_N = mkN "rest - day" "rest - days";
 lin rest_home_N = mkN "rest - home" "rest - homes";
@@ -46755,7 +46736,6 @@ lin rugose_A = mkA "rugose" ;
 lin rugulah_N = mkN "rugulah" ;
 lin ruin_N = mkN "ruin" "ruins";
 lin ruin_V2 = mkV2 (mkV "ruin" "ruins" "ruined" "ruined" "ruining");
 lin ruin_VS = mkVS (mkV "ruin");
 lin ruination_N = mkN "ruination" ;
 lin ruinous_A = compoundA (mkA "ruinous");
 lin rule_N = mkN "rule" "rules";
@@ -46843,7 +46823,7 @@ lin rush_N = mkN "rush" "rushes";
 lin rush_V = mkV "rush" "rushes" "rushed" "rushed" "rushing";
 lin rush_V2 = mkV2 (mkV "rush" "rushes" "rushed" "rushed" "rushing");
 lin rush_V2V = mkV2V (mkV "rush" "rushes" "rushed" "rushed" "rushing") noPrep to_Prep ;
-lin rush_VS = mkVS (mkV "rush" "rushes" "rushed" "rushed" "rushing");
+lin rush_VV = mkVV (mkV "rush" "rushes" "rushed" "rushed" "rushing");
 lin rusher_N = mkN "rusher" ;
 lin rushlight_N = mkN "rushlight" "rushlights";
 lin rushlike_A = mkA "rushlike" ;
@@ -48109,7 +48089,7 @@ lin seakale_N = mkN "seakale" ;
 lin seal_N = mkN "seal" "seals";
 lin seal_V = mkV "seal" "seals" "sealed" "sealed" "sealing";
 lin seal_V2 = mkV2 (mkV "seal" "seals" "sealed" "sealed" "sealing");
-lin seal_VS = mkVS (mkV "seal" "seals" "sealed" "sealed" "sealing");
+lin seal_V2A = mkV2A (mkV "seal" "seals" "sealed" "sealed" "sealing") noPrep;
 lin seal_ring_N = mkN "seal - ring" "seal - rings";
 lin sealant_N = mkN "sealant" ;
 lin sealer_N = mkN "sealer" "sealers";
@@ -48749,8 +48729,7 @@ lin service_N = mkN "service" "services";
 lin service_V2 = mkV2 (mkV "service" "services" "serviced" "serviced" "servicing");
 lin serviceability_N = mkN "serviceability" ;
 lin serviceable_A = compoundA (mkA "serviceable");
-lin serviceman_N = mkN "serviceman" "servicemen" {- FIXME: guessed plural form -};
+lin serviceman_N = mkN "serviceman" "servicemen";
 lin services_N = mkN "services" ;
 lin servicing_N = mkN "servicing" ;
 lin serviette_N = mkN "serviette" "serviettes";
 lin servile_A = compoundA (mkA "servile");
@@ -48790,7 +48769,6 @@ lin settle_N = mkN "settle" "settles";
 lin settle_V = mkV "settle" "settles" "settled" "settled" "settling";
 lin settle_V2 = mkV2 (mkV "settle" "settles" "settled" "settled" "settling");
 lin settle_VA = mkVA (mkV "settle" "settles" "settled" "settled" "settling");
 lin settle_VS = mkVS (mkV "settle" "settles" "settled" "settled" "settling");
 lin settlement_N = mkN "settlement" "settlements";
 lin settler_N = mkN "settler" "settlers";
 lin settling_N = mkN "settling" ;
@@ -48806,7 +48784,7 @@ lin several_Num = {s = table {Nom => "several"; Gen => "several's"}; n = Pl; has
 lin severally_Adv = mkAdv "severally";
 lin severalty_N = mkN "severalty" ;
 lin severance_N = mkN "severance" ;
-lin severe_A = mkA "severe" "severer";
+lin severe_A = variants {compoundA (mkA "severe"); mkA "severe" "severer"};
 lin severity_N = mkN "severity" "severities";
 lin sevilla_PN = mkPN "Sevilla";
 lin seville_PN = mkPN "Seville";
@@ -52373,6 +52351,7 @@ lin stigmatize_V2 = mkV2 (mkV "stigmatize" "stigmatizes" "stigmatized" "stigmati
 lin stile_N = mkN "stile" "stiles";
 lin stiletto_N = mkN "stiletto" "stilettos";
 lin still_A = mkA "still" "stiller";
 lin still_AdA = mkAdA "still";
 lin still_AdV = mkAdV "still";
 lin still_Adv = mkAdv "still";
 lin still_N = mkN "still" "stills";
@@ -53137,7 +53116,7 @@ lin subterranean_A = compoundA (mkA "subterranean");
 lin subthalamus_N = mkN "subthalamus" ;
 lin subtilin_N = mkN "subtilin" ;
 lin subtitle_N = mkN "subtitle" "subtitles";
-lin subtitle_VS = mkVS (mkV "subtitle");
+lin subtitle_V3 = mkV3 (mkV "subtitle");
 lin subtle_A = mkA "subtle" "subtler";
 lin subtlety_N = mkN "subtlety" "subtleties";
 lin subtly_Adv = mkAdv "subtly";
@@ -53666,7 +53645,6 @@ lin survival_N = mkN "survival" "survivals";
 lin survivalist_N = mkN "survivalist" ;
 lin survive_V = mkV "survive" "survives" "survived" "survived" "surviving";
 lin survive_V2 = mkV2 (mkV "survive" "survives" "survived" "survived" "surviving");
 lin survive_VS = mkVS (mkV "survive" "survives" "survived" "survived" "surviving");
 lin survivor_N = mkN "survivor" "survivors";
 lin susan_PN = mkPN "Susan";
 lin susanna_PN = mkPN "Susanna";
@@ -54184,7 +54162,7 @@ lin taffy_N = mkN "taffy" "taffies";
 lin tag_N = mkN "tag" "tags";
 lin tag_V = mkV "tag" "tags" "tagged" "tagged" "tagging";
 lin tag_V2 = mkV2 (mkV "tag" "tags" "tagged" "tagged" "tagging");
-lin tag_VS = mkVS (mkV "tag" "tags" "tagged" "tagged" "tagging");
+lin tag_V3 = mkV3 (mkV "tag" "tags" "tagged" "tagged" "tagging");
 lin tagalong_N = mkN "tagalong" ;
 lin tagasaste_N = mkN "tagasaste" ;
 lin tagger_N = mkN "tagger" ;
@@ -54264,7 +54242,6 @@ lin talismanic_A = mkA "talismanic" ;
 lin talk_N = mkN "talk" "talks";
 lin talk_V = mkV "talk" "talks" "talked" "talked" "talking";
 lin talk_V2 = mkV2 (mkV "talk" "talks" "talked" "talked" "talking");
 lin talk_VA = mkVA (mkV "talk" "talks" "talked" "talked" "talking");
 lin talkative_A = compoundA (mkA "talkative");
 lin talker_N = mkN "talker" "talkers";
 lin talkie_N = mkN "talkie" "talkies";
@@ -54418,7 +54395,6 @@ lin target_N = mkN "target" "targets";
 lin target_V2 = mkV2 (variants {mkV "target" "targets" "targeted"  "targeted"  "targeting" ;
                                mkV "target" "targets" "targetted" "targetted" "targetting"});
 lin target_V2V = mkV2V (mkV "target") noPrep to_Prep ;
 lin target_VS = mkVS (mkV "target");
 lin tariff_N = mkN "tariff" "tariffs";
 lin tarmac_N = mkN "tarmac" ;
 lin tarmac_V2 = mkV2 (mkV "tarmac" "IRREG" "IRREG" "IRREG" "IRREG");
@@ -54570,7 +54546,6 @@ lin teacake_N = mkN "teacake" "teacakes";
 lin teach_V = IrregEng.teach_V;
 lin teach_V2 = mkV2 (IrregEng.teach_V);
 lin teach_V2V = mkV2V (IrregEng.teach_V) noPrep to_Prep ;
 lin teach_VS = mkVS (IrregEng.teach_V);
 lin teach_in_N = mkN "teach - in" "teach - ins";
 lin teachable_A = compoundA (mkA "teachable");
 lin teacher_N = mkN "teacher" "teachers";
@@ -55169,7 +55144,6 @@ lin therapist_N = mkN "therapist" "therapists";
 lin therapsid_N = mkN "therapsid" ;
 lin therapy_N = mkN "therapy" "therapies";
 lin there_Adv = mkAdv "there";
 lin there_N = mkN "there" ;
 lin thereabout_Adv = mkAdv "thereabout";
 lin thereabouts_Adv = mkAdv "thereabouts";
 lin thereafter_Adv = mkAdv "thereafter";
@@ -55459,7 +55433,6 @@ lin throughway_N = mkN "throughway" "throughways";
 lin throw_N = mkN "throw" "throws";
 lin throw_V = IrregEng.throw_V;
 lin throw_V2 = mkV2 (IrregEng.throw_V);
 lin throw_VS = mkVS (IrregEng.throw_V);
 lin throw_in_N = mkN "throw - in" "throw - ins";
 lin throwaway_N = mkN "throwaway" "throwaways";
 lin throwback_N = mkN "throwback" "throwbacks";
@@ -55804,6 +55777,7 @@ lin tizzy_N = mkN "tizzy" "tizzies";
 lin tnt_N = mkN "tnt" ;
 lin to_Adv = mkAdv "to";
 lin to_Prep = mkPrep "to";
 lin to_date_Adv = mkAdv "to date";
 lin to_do_N = mkN "to - do" "to - dos";
 lin toad_N = mkN "toad" "toads";
 lin toad_in_the_hole_N = mkN "toad - in - the - hole" "IRREG";
@@ -56905,8 +56879,7 @@ lin truculent_A = compoundA (mkA "truculent");
 lin trudge_N = mkN "trudge" "trudges";
 lin trudge_V = mkV "trudge" "trudges" "trudged" "trudged" "trudging";
 lin trudger_N = mkN "trudger" ;
-lin true_A = mkA "true" "truer";
+lin true_A = irregAdv (mkA "true" "truer") "truly";
 lin true_Adv = mkAdv "true";
 lin true_N = mkN "true" "trues";
 lin true_V2 = mkV2 (mkV "true" "trues" "trued" "trued" "truing");
 lin true_blue_A = compoundA (mkA "true - blue");
@@ -56916,7 +56889,6 @@ lin truelove_N = mkN "truelove" "trueloves";
 lin trueness_N = mkN "trueness" ;
 lin truffle_N = mkN "truffle" "truffles";
 lin truism_N = mkN "truism" "truisms";
 lin truly_Adv = mkAdv "truly";
 lin trump_N = mkN "trump" "trumps";
 lin trump_V = mkV "trump" "trumps" "trumped" "trumped" "trumping";
 lin trump_V2 = mkV2 (mkV "trump" "trumps" "trumped" "trumped" "trumping");
@@ -56962,7 +56934,6 @@ lin try_N = mkN "try" "tries";
 lin try_V = mkV "try" "tries" "tried" "tried" "trying";
 lin try_V2 = mkV2 (mkV "try" "tries" "tried" "tried" "trying");
 lin try_V2V = mkV2V (mkV "try" "tries" "tried" "tried" "trying") noPrep to_Prep;
 lin try_VS = mkVS (mkV "try" "tries" "tried" "tried" "trying");
 lin try_VV = mkVV (mkV "try" "tries" "tried" "tried" "trying");
 lin try_on_N = mkN "try - on" "try - ons";
 lin try_out_N = mkN "try - out" "try - outs";
@@ -57052,10 +57023,10 @@ lin tumid_A = compoundA (mkA "tumid");
 lin tumidity_N = mkN "tumidity" ;
 lin tummy_N = mkN "tummy" "tummies";
 lin tumor_N = mkN "tumor" ;
-lin tumour_N = mkN "tumour" "tumours";
+lin tumour_N = mkN (variants {"tumour"; "tumor"});
 lin tumult_N = mkN "tumult" "tumults";
 lin tumultuous_A = compoundA (mkA "tumultuous");
-lin tumulus_N = mkN "tumulus" "tumuli" {- FIXME: guessed plural form -};
+lin tumulus_N = mkN "tumulus" "tumuli";
 lin tun_N = mkN "tun" "tuns";
 lin tuna_N = mkN "tuna" "tuna";
 lin tunaburger_N = mkN "tunaburger" ;
@@ -59384,7 +59355,6 @@ lin value_added_A = compoundA (mkA "value - added");
 lin valueless_A = compoundA (mkA "valueless");
 lin valuelessness_N = mkN "valuelessness" ;
 lin valuer_N = mkN "valuer" "valuers";
 lin values_N = mkN "values" ;
 lin valve_N = mkN "valve" "valves";
 lin valved_A = mkA "valved" ;
 lin valvotomy_N = mkN "valvotomy" ;
@@ -60403,6 +60373,7 @@ lin warmongering_N = mkN "warmongering" ;
 lin warmth_N = mkN "warmth" ;
 lin warn_V = mkV "warn";
 lin warn_V2 = mkV2 (mkV "warn" "warns" "warned" "warned" "warning");
 lin warn_V2V = mkV2V (mkV "warn" "warns" "warned" "warned" "warning") noPrep to_Prep;
 lin warn_VS = mkVS (mkV "warn");
 lin warner_N = mkN "warner" ;
 lin warning_N = mkN "warning" "warnings";
@@ -60493,11 +60464,12 @@ lin watch_guard_N = mkN "watch - guard" "watch - guards";
 lin watch_key_N = mkN "watch - key" "watch - keys";
 lin watchband_N = mkN "watchband" ;
 lin watchdog_N = mkN "watchdog" "watchdogs";
-lin watcher_N = mkN "watcher" "watchers";
+lin watcherMasc_N = mkN masculine (mkN "watcher" "watchers");
 lin watcherFem_N = mkN feminine (mkN "watcher" "watchers");
 lin watchful_A = compoundA (mkA "watchful");
 lin watchfulness_N = mkN "watchfulness" ;
 lin watchmaker_N = mkN "watchmaker" "watchmakers";
-lin watchman_N = mkN "watchman" "watchmen" {- FIXME: guessed plural form -};
+lin watchman_N = mkN "watchman" "watchmen";
 lin watchtower_N = mkN "watchtower" "watchtowers";
 lin watchword_N = mkN "watchword" "watchwords";
 lin water_N = mkN "water" "waters";
@@ -62044,8 +62016,8 @@ lin zigzag_V = mkV "zigzag" "zigzags" "zigzagged" "zigzagged" "zigzagging";
 lin zill_N = mkN "zill" ;
 lin zillion_A = mkA "zillion" ;
 lin zimbabwe_PN = mkPN "Zimbabwe";
-lin zimbabwean_A = compoundA (mkA "zimbabwean");
+lin zimbabwean_A = compoundA (mkA "Zimbabwean");
-lin zimbabwean_N = mkN "zimbabwean" "zimbabweans";
+lin zimbabwean_N = mkN "Zimbabwean" "Zimbabweans";
 lin zinc_N = mkN "zinc" ;
 lin zinfandel_N = mkN "zinfandel" ;
 lin zing_N = mkN "zing" ;
@@ -62161,9 +62133,9 @@ lin owing_to_Prep = mkPrep "owing to";
 lin prior_to_Prep = mkPrep "prior to";
 lin pursuant_to_Prep = mkPrep "pursuant to";
 lin rather_than_Prep = mkPrep "rather than";
 lin rather_than_Conj = mkConj "rather than";
 lin regardless_of_Prep = mkPrep "regardless of";
 lin right_of_Prep = mkPrep "right of";
 lin subsequent_to_Prep = mkPrep "subsequent to";
 lin thanks_to_Prep = mkPrep "thanks to";
 lin that_of_Prep = mkPrep "that of";
 lin up_to_Prep = mkPrep "up to";
@@ -62207,7 +62179,7 @@ lin qua_Prep = mkPrep "qua";
 lin re_Prep = mkPrep (variants {"re"; "in re"});
 lin sans_Prep = mkPrep "sans";
 lin unto_Prep = mkPrep "unto";
-lin vis_a_vis_Prep = mkPrep "vis-à-vis";
+lin vis_a_vis_Prep = mkPrep (variants {"vis-à-vis"; "vis-a-vis"});
 lin abide_by_V2 = prepV2 (mkV "abide") (mkPrep "by");
@@ -62444,7 +62416,7 @@ lin bust_up_V = partV (mkV "bust") "up";
 lin butt_in_V = partV (mkV "butt") "in";
 lin butt_out_V = partV (mkV "butt") "out";
 lin butter_up_V2 = mkV2 (partV (mkV "butter") "up");
-lin buy_back_V = partV (mkV "buy") "back";
+lin buy_back_V2 = mkV2 (partV (mkV "buy") "back");
 lin buy_in_V2 = mkV2 (partV IrregEng.buy_V "in");
 lin buy_into_V2 = prepV2 IrregEng.buy_V (mkPrep "into");
 lin buy_off_V2 = mkV2 (partV IrregEng.buy_V "off");
@@ -62455,7 +62427,7 @@ lin buzz_off_V = partV (mkV "buzz") "off";
 lin call_after_V2 = prepV2 (mkV "call") (mkPrep "after");
 lin call_around_V = partV (mkV "call") "around";
 lin call_back_V2 = mkV2 (partV (mkV "call") "back");
-lin call_for_V2 = prepV2 (mkV "call") (mkPrep "for");
+lin call_for_V2V = mkV2V (mkV "call") (mkPrep "for") (mkPrep "to");
 lin call_forth_V2 = mkV2 (partV (mkV "call") "forth");
 lin call_in_V = partV (mkV "call") "in";
 lin call_in_V2 = mkV2 (partV (mkV "call") "in");
@@ -63863,7 +63835,7 @@ lin plump_for_V2 = prepV2 (mkV "plump") (mkPrep "for");
 lin plump_up_V2 = mkV2 (partV (mkV "plump") "up");
 lin plump_yourself_down_V = partV (reflV (mkV "plump")) "down";
 lin plunge_in_V = partV (mkV "plunge") "in";
-lin point_out_V = partV (mkV "point") "out";
+lin point_out_V2 = mkV2 (partV (mkV "point") "out");
 lin point_out_VS = mkVS (partV (mkV "point") "out");
 lin point_up_V = partV (mkV "point") "up";
 lin poke_about_V = partV (mkV "poke") "about";
@@ -63935,7 +63907,7 @@ lin push_around_V = partV (mkV "push") "around";
 lin push_back_V = partV (mkV "push") "back";
 lin push_in_V2 = prepV2 (mkV "push") (mkPrep "in");
 lin push_through_V = partV (mkV "push") "through";
-lin push_up_V = partV (mkV "push") "up";
+lin push_up_V2 = mkV2 (partV (mkV "push") "up");
 lin put_across_V = partV IrregEng.put_V "across";
 lin put_across_V2 = mkV2 (partV IrregEng.put_V "across");
 lin put_aside_V = partV (mkV "put") "aside";
@@ -64136,7 +64108,7 @@ lin see_off_V2 = mkV2 (partV IrregEng.see_V "off");
 lin see_out_V2 = mkV2 (partV IrregEng.see_V "out");
 lin see_through_V2 = mkV2 (partV IrregEng.see_V "through");
 lin see_to_V2 = prepV2 IrregEng.see_V (mkPrep "to");
-lin seek_out_V = partV (mkV "seek") "out";
+lin seek_out_V2 = mkV2 (partV (mkV "seek") "out");
 lin seize_up_V = partV (mkV "seize") "up";
 lin sell_back_V = partV (mkV "sell") "back";
 lin sell_off_V2 = mkV2 (partV IrregEng.sell_V "off");
--- a/lib/src/english/DictEngAbs.gf
+++ b/lib/src/english/DictEngAbs.gf
@@ -814,7 +814,8 @@ fun administer_V2 : V2;
 fun administrable_A : A;
 fun administration_N : N;
 fun administrative_A : A;
-fun administrator_N : N;
+fun administratorFem_N : N;
 fun administratorMasc_N : N;
 fun administrivia_N : N;
 fun admirability_N : N;
 fun admirable_A : A;
@@ -955,7 +956,8 @@ fun advise_V : V;
 fun advise_V2 : V2;
 fun advise_VS : VS;
 fun advisee_N : N;
-fun adviser_N : N;
+fun adviserMasc_N : N;
 fun adviserFem_N : N;
 fun advisory_A : A;
 fun advisory_N : N;
 fun advocacy_N : N;
@@ -1115,7 +1117,8 @@ fun africanMasc_N : N;
 fun african_A : A;
 fun afrikaans_N : N;
 fun afrikaner_A : A;
-fun afrikaner_N : N;
+fun afrikanerFem_N : N;
 fun afrikanerMasc_N : N;
 fun afro_americanFem_N : N;
 fun afro_americanMasc_N : N;
 fun afro_asian_A : A;
@@ -1538,7 +1541,8 @@ fun alicante_PN : PN;
 fun alice_PN : PN;
 fun alidade_N : N;
 fun alien_A : A;
-fun alien_N : N;
+fun alienFem_N : N;
 fun alienMasc_N : N;
 fun alienable_A : A;
 fun alienage_N : N;
 fun alienate_V2 : V2;
@@ -1730,7 +1734,6 @@ fun aloes_N : N;
 fun aloft_Adv : Adv;
 fun aloha_N : N;
 fun alone_A : A;
 fun alone_Adv : Adv;
 fun aloneness_N : N;
 fun along_Adv : Adv;
 fun along_Prep : Prep ;
@@ -3369,7 +3372,6 @@ fun aroma_N : N;
 fun aromatherapy_N : N;
 fun aromatic_A : A;
 fun arose_V2 : V2;
 fun arose_VS : VS;
 fun around_AdN : AdN;
 fun around_Adv : Adv;
 fun around_Prep : Prep ;
@@ -6896,6 +6898,7 @@ fun bother_N : N;
 fun bother_V : V;
 fun bother_V2 : V2;
 fun bother_V2V : V2V;
 fun bother_VV : VV;
 fun bothersome_A : A;
 fun botonee_A : A;
 fun botryoid_A : A;
@@ -7440,8 +7443,6 @@ fun broil_V : V;
 fun broil_V2 : V2;
 fun broiler_N : N;
 fun broke_A : A;
 fun broke_VA : VA;
 fun broke_VS : VS;
 fun broken_hearted_A : A;
 fun brokenhearted_A : A;
 fun broker_N : N;
@@ -7500,7 +7501,6 @@ fun brotherly_Adv : Adv;
 fun brotula_N : N;
 fun brougham_N : N;
 fun brought_V : V;
 fun brought_VS : VS;
 fun broughton_PN : PN;
 fun brouhaha_N : N;
 fun brow_N : N;
@@ -8254,7 +8254,6 @@ fun call_V2 : V2;
 fun call_V2A : V2A;
 fun call_V2V : V2V;
 fun call_V3 : V3;
 fun call_VS : VS;
 fun call_box_N : N;
 fun call_girl_N : N;
 fun call_over_N : N;
@@ -8427,7 +8426,8 @@ fun candescent_A : A;
 fun candid_A : A;
 fun candida_N : N;
 fun candidacy_N : N;
-fun candidate_N : N;
+fun candidateMasc_N : N;
 fun candidateFem_N : N;
 fun candidature_N : N;
 fun candidiasis_N : N;
 fun candle_N : N;
@@ -8874,7 +8874,8 @@ fun cartography_N : N;
 fun carton_N : N;
 fun cartoon_N : N;
 fun cartoon_V2 : V2;
-fun cartoonist_N : N;
+fun cartoonistMasc_N : N;
 fun cartoonistFem_N : N;
 fun cartouche_N : N;
 fun cartridge_N : N;
 fun cartridge_belt_N : N;
@@ -9196,7 +9197,6 @@ fun cease_N : N;
 fun cease_V : V;
 fun cease_V2 : V2;
 fun cease_V2V : V2V;
 fun cease_VS : VS;
 fun cease_fire_N : N;
 fun ceaseless_A : A;
 fun cecal_A : A;
@@ -9527,7 +9527,6 @@ fun chanar_N : N;
 fun chance_N : N;
 fun chance_V : V;
 fun chance_V2 : V2;
 fun chance_VS : VS;
 fun chancel_N : N;
 fun chancellery_N : N;
 fun chancellor_N : N;
@@ -10348,7 +10347,8 @@ fun citadel_N : N;
 fun citation_N : N;
 fun cite_V2 : V2;
 fun citified_A : A;
-fun citizen_N : N;
+fun citizenFem_N : N;
 fun citizenMasc_N : N;
 fun citizenry_N : N;
 fun citizenship_N : N;
 fun citrange_N : N;
@@ -14172,7 +14172,8 @@ fun dasyure_N : N;
 fun data_N : N;
 fun database_N : N;
 fun datable_A : A;
-fun date_N : N;
+fun date_1_N : N;
 fun date_7_N : N;
 fun date_V : V;
 fun date_V2 : V2;
 fun dateless_A : A;
@@ -14719,7 +14720,6 @@ fun delaware_PN : PN;
 fun delay_N : N;
 fun delay_V : V;
 fun delay_V2 : V2;
 fun delay_VS : VS;
 fun delayed_action_A : A;
 fun delayed_action_N : N;
 fun delayer_N : N;
@@ -15212,7 +15212,6 @@ fun detachable_A : A;
 fun detachment_N : N;
 fun detail_N : N;
 fun detail_V2 : V2;
 fun details_N : N;
 fun detain_V2 : V2;
 fun detainee_N : N;
 fun detect_V2 : V2;
@@ -15302,7 +15301,6 @@ fun deviation_N : N;
 fun deviationism_N : N;
 fun deviationist_N : N;
 fun device_N : N;
 fun devices_N : N;
 fun devil_N : N;
 fun devil_V : V;
 fun devil_V2 : V2;
@@ -15730,7 +15728,6 @@ fun diplomacy_N : N;
 fun diplomat_N : N;
 fun diplomate_N : N;
 fun diplomatic_A : A;
 fun diplomatically_Adv : Adv;
 fun diplomatist_N : N;
 fun diplopia_N : N;
 fun diplotene_N : N;
@@ -15858,7 +15855,6 @@ fun disciplinary_A : A;
 fun discipline_N : N;
 fun discipline_V2 : V2;
 fun disclaim_V2 : V2;
 fun disclaim_VS : VS;
 fun disclaimer_N : N;
 fun disclose_V : V;
 fun disclose_V2 : V2;
@@ -16566,7 +16562,6 @@ fun donate_V : V;
 fun donate_V2 : V2;
 fun donation_N : N;
 fun doncaster_PN : PN;
 fun done_VA : VA;
 fun donegal_PN : PN;
 fun donetsk_PN : PN;
 fun dong_N : N;
@@ -17365,7 +17360,7 @@ fun dystrophy_N : N;
 fun dysuria_N : N;
 fun e'en_Adv : Adv;
 fun e'er_Adv : Adv;
-fun e_N : N;
+fun e_mail_N : N;
 fun each_Adv : Adv;
 fun each_Det : Det;
 fun eager_A : A;
@@ -18205,7 +18200,6 @@ fun end_N : N;
 fun end_V : V;
 fun end_V2 : V2;
 fun end_VA : VA;
 fun end_VS : VS;
 fun end_all_N : N;
 fun end_tail_V2 : V2;
 fun endameba_N : N;
@@ -18373,7 +18367,6 @@ fun enormous_A : A;
 fun enormousness_N : N;
 fun enosis_N : N;
 fun enough_A : A;
 fun enough_Adv : Adv;
 fun enough_N : N;
 fun enplane_V : V;
 fun enplane_V2 : V2;
@@ -18447,7 +18440,6 @@ fun enthuse_V : V;
 fun enthusiasm_N : N;
 fun enthusiast_N : N;
 fun enthusiastic_A : A;
 fun enthusiastically_Adv : Adv;
 fun entice_V2 : V2;
 fun enticement_N : N;
 fun entire_A : A;
@@ -19736,7 +19728,6 @@ fun fail_N : N;
 fun fail_V : V;
 fun fail_V2 : V2;
 fun fail_V2V : V2V;
 fun fail_VS : VS;
 fun fail_VV : VV;
 fun fail_safe_A : A;
 fun failing_N : N;
@@ -19848,7 +19839,7 @@ fun fanciful_A : A;
 fun fancy_A : A;
 fun fancy_N : N;
 fun fancy_V2 : V2;
-fun fancy_VS : VS;
+fun fancy_V3 : V3;
 fun fancy_free_A : A;
 fun fandango_N : N;
 fun fandom_N : N;
@@ -19873,6 +19864,7 @@ fun fantasy_N : N;
 fun fantods_N : N;
 fun fao_N : N;
 fun far_A : A;
 fun far_AdA : AdA;
 fun far_V2 : V2;
 fun far_famed_A : A;
 fun far_fetched_A : A;
@@ -20142,8 +20134,6 @@ fun felixstowe_PN : PN;
 fun fell_A : A;
 fun fell_N : N;
 fun fell_V2 : V2;
 fun fell_V2V : V2V;
 fun fell_VA : VA;
 fun fellah_N : N;
 fun fellatio_N : N;
 fun felloe_N : N;
@@ -22094,7 +22084,8 @@ fun futile_A : A;
 fun futility_N : N;
 fun futon_N : N;
 fun future_A : A;
-fun future_N : N;
+fun future_1_N : N;
 fun future_3_N : N;
 fun futureless_A : A;
 fun futurism_N : N;
 fun futurist_N : N;
@@ -23988,7 +23979,6 @@ fun guru_N : N;
 fun gush_N : N;
 fun gush_V : V;
 fun gusher_N : N;
 fun gushes_VS : VS;
 fun gushingly_Adv : Adv;
 fun gusset_N : N;
 fun gusseted_A : A;
@@ -24441,9 +24431,6 @@ fun harasser_N : N;
 fun harassment_N : N;
 fun harbin_PN : PN;
 fun harbinger_N : N;
 fun harbor_N : N;
 fun harbor_V2 : V2;
 fun harborage_N : N;
 fun harbour_N : N;
 fun harbour_V : V;
 fun harbour_V2 : V2;
@@ -24592,7 +24579,7 @@ fun hatchway_N : N;
 fun hate_N : N;
 fun hate_V2 : V2;
 fun hate_V2V : V2V;
-fun hate_VS : VS;
+fun hate_VV : VV;
 fun hateful_A : A;
 fun hatefulness_N : N;
 fun hatemonger_N : N;
@@ -24685,7 +24672,6 @@ fun hazel_PN : PN;
 fun hazelnut_N : N;
 fun haziness_N : N;
 fun hazy_A : A;
 fun he_N : N;
 fun he_Pron : Pron;
 fun he_goat_N : N;
 fun he_man_N : N;
@@ -24725,7 +24711,7 @@ fun headmistress_N : N;
 fun headmistressship_N : N;
 fun headpiece_N : N;
 fun headpin_N : N;
-fun headquarters_N : N;
+fun headquarter_N : N;
 fun headrace_N : N;
 fun headrest_N : N;
 fun headroom_N : N;
@@ -25105,7 +25091,6 @@ fun herd_V2 : V2;
 fun herder_N : N;
 fun herdsman_N : N;
 fun here_Adv : Adv;
 fun here_N : N;
 fun hereabout_Adv : Adv;
 fun hereabouts_Adv : Adv;
 fun hereafter_Adv : Adv;
@@ -25169,7 +25154,6 @@ fun hesitance_N : N;
 fun hesitancy_N : N;
 fun hesitant_A : A;
 fun hesitate_V : V;
 fun hesitate_VS : VS;
 fun hesitate_VV : VV;
 fun hesitatingly_Adv : Adv;
 fun hesitation_N : N;
@@ -25722,9 +25706,6 @@ fun honk_N : N;
 fun honk_V : V;
 fun honker_N : N;
 fun honkytonk_N : N;
 fun honor_V2 : V2;
 fun honorable_A : A;
 fun honorableness_N : N;
 fun honorarium_N : N;
 fun honorary_A : A;
 fun honoree_N : N;
@@ -25734,7 +25715,7 @@ fun honoring_N : N;
 fun honour_N : N;
 fun honour_V2 : V2;
 fun honourable_A : A;
-fun honours_N : N;
+fun honourableness_N : N;
 fun hoo_PN : PN;
 fun hooch_N : N;
 fun hood_N : N;
@@ -27065,8 +27046,10 @@ fun in_Prep : Prep;
 fun in_addition_Adv : Adv;
 fun in_chief_A : A;
 fun in_fighting_N : N;
 fun in_general_Adv : Adv;
 fun in_loco_parentis_Adv : Adv;
 fun in_patient_N : N;
 fun in_particular_Adv : Adv;
 fun in_service_A : A;
 fun in_situ_Adv : Adv;
 fun in_toto_Adv : Adv;
@@ -27279,7 +27262,9 @@ fun incorruptness_N : N;
 fun increase_N : N;
 fun increase_V : V;
 fun increase_V2 : V2;
 fun increasingly_AdA : AdA;
 fun increasingly_Adv : Adv;
 fun increasingly_AdV : AdV;
 fun incredibility_N : N;
 fun incredible_A : A;
 fun incredulity_N : N;
@@ -28095,6 +28080,7 @@ fun interdict_V2 : V2;
 fun interdiction_N : N;
 fun interdisciplinary_A : A;
 fun interest_N : N;
 fun interest_4_N : N;
 fun interest_V : V;
 fun interest_V2 : V2;
 fun interested_A : A;
@@ -28934,7 +28920,6 @@ fun jetty_N : N;
 fun jew_N : N;
 fun jewel_N : N;
 fun jewel_V2 : V2;
 fun jeweler_N : N;
 fun jeweller_N : N;
 fun jewellery_N : N;
 fun jewelry_N : N;
@@ -29180,7 +29165,7 @@ fun julian_PN : PN;
 fun julie_PN : PN;
 fun julienne_N : N;
 fun juliet_PN : PN;
-fun july_N : N;
+fun july_PN : PN;
 fun jumble_N : N;
 fun jumble_V : V;
 fun jumble_V2 : V2;
@@ -29867,7 +29852,8 @@ fun labdanum_N : N;
 fun label_N : N;
 fun label_V : V;
 fun label_V2 : V2;
-fun label_VS : VS;
+fun label_V2A : V2A;
 fun label_V3 : V3;
 fun labeled_A : A;
 fun labetalol_N : N;
 fun labial_A : A;
@@ -30525,7 +30511,6 @@ fun leeway_N : N;
 fun leflunomide_N : N;
 fun left_A : A;
 fun left_N : N;
 fun left_VS : VS;
 fun left_hand_A : A;
 fun left_handed_A : A;
 fun left_wing_N : N;
@@ -31037,6 +31022,7 @@ fun limewater_N : N;
 fun limey_N : N;
 fun limit_N : N;
 fun limit_V2 : V2;
 fun limit_V2V : V2V;
 fun limitation_N : N;
 fun limitedly_Adv : Adv;
 fun limiter_N : N;
@@ -31515,7 +31501,6 @@ fun lonely_A : A;
 fun loner_N : N;
 fun lonesome_A : A;
 fun long_A : A;
 fun long_Adv : Adv;
 fun long_N : N;
 fun long_V : V;
 fun long_distance_A : A;
@@ -32743,7 +32728,6 @@ fun marumi_N : N;
 fun marupa_N : N;
 fun marvel_N : N;
 fun marvel_V : V;
 fun marvel_VS : VS;
 fun marvellous_A : A;
 fun marvelous_A : A;
 fun marxism_N : N;
@@ -32885,7 +32869,8 @@ fun maternalistic_A : A;
 fun maternity_N : N;
 fun matey_A : A;
 fun mathematical_A : A;
-fun mathematician_N : N;
+fun mathematicianMasc_N : N;
 fun mathematicianFem_N : N;
 fun mathematics_N : N;
 fun maths_N : N;
 fun matinee_N : N;
@@ -34924,6 +34909,7 @@ fun move_N : N;
 fun move_V : V;
 fun move_V2 : V2;
 fun move_V2V : V2V;
 fun move_V2A : V2A;
 fun move_VV : VV;
 fun movement_N : N;
 fun mover_N : N;
@@ -37168,7 +37154,8 @@ fun offence_N : N;
 fun offenceless_A : A;
 fun offend_V : V;
 fun offend_V2 : V2;
-fun offender_N : N;
+fun offenderMasc_N : N;
 fun offenderFem_N : N;
 fun offense_N : N;
 fun offenseless_A : A;
 fun offensive_A : A;
@@ -37560,7 +37547,6 @@ fun opsonin_N : N;
 fun opsonization_N : N;
 fun opt_V : V;
 fun opt_V2V : V2V;
 fun opt_VS : VS;
 fun opt_VV : VV;
 fun optative_A : A;
 fun optative_N : N;
@@ -39322,7 +39308,7 @@ fun pay_claim_N : N;
 fun pay_packet_N : N;
 fun pay_station_N : N;
 fun payable_A : A;
-fun payables_N : N;
+fun payable_N : N;
 fun payback_N : N;
 fun paycheck_N : N;
 fun payday_N : N;
@@ -41166,7 +41152,7 @@ fun plutonium_N : N;
 fun ply_N : N;
 fun ply_V : V;
 fun ply_V2 : V2;
-fun ply_VS : VS;
+fun ply_V2A : V2A;
 fun plymouth_PN : PN;
 fun plywood_N : N;
 fun pneumatic_A : A;
@@ -41476,7 +41462,6 @@ fun poncho_N : N;
 fun pond_N : N;
 fun ponder_V : V;
 fun ponder_V2 : V2;
 fun ponder_VS : VS;
 fun ponderable_A : A;
 fun ponderosa_N : N;
 fun ponderous_A : A;
@@ -42639,7 +42624,8 @@ fun program_V2V : V2V;
 fun programma_N : N;
 fun programme_N : N;
 fun programme_V2 : V2;
-fun programmer_N : N;
+fun programmerFem_N : N;
 fun programmerMasc_N : N;
 fun programming_N : N;
 fun progress_N : N;
 fun progress_V : V;
@@ -42652,7 +42638,6 @@ fun progressivism_N : N;
 fun progymnosperm_N : N;
 fun prohibit_V : V;
 fun prohibit_V2 : V2;
 fun prohibit_VS : VS;
 fun prohibition_N : N;
 fun prohibitionist_N : N;
 fun prohibitive_A : A;
@@ -43862,7 +43847,6 @@ fun quoits_N : N;
 fun quonset_N : N;
 fun quorum_N : N;
 fun quot_V : V;
 fun quot_VS : VS;
 fun quota_N : N;
 fun quotability_N : N;
 fun quotable_A : A;
@@ -44540,7 +44524,7 @@ fun receding_N : N;
 fun receipt_N : N;
 fun receipt_V2 : V2;
 fun receivable_A : A;
-fun receivables_N : N;
+fun receivable_N : N;
 fun receive_V : V;
 fun receive_V2 : V2;
 fun receiver_N : N;
@@ -44613,7 +44597,8 @@ fun recoding_N : N;
 fun recognition_N : N;
 fun recognizable_A : A;
 fun recognizance_N : N;
-fun recognize_V2 : V2;
+fun recognize_1_V2 : V2;
 fun recognize_4_V2 : V2;
 fun recognize_VS : VS;
 fun recoil_N : N;
 fun recoil_V : V;
@@ -44937,7 +44922,6 @@ fun regalia_N : N;
 fun regard_N : N;
 fun regard_V : V;
 fun regard_V2 : V2;
 fun regard_VS : VS;
 fun regardful_A : A;
 fun regardless_A : A;
 fun regardless_Adv : Adv;
@@ -45075,7 +45059,6 @@ fun relate_V2 : V2;
 fun relatedness_N : N;
 fun relation_N : N;
 fun relational_A : A;
 fun relations_N : N;
 fun relationship_N : N;
 fun relative_A : A;
 fun relative_N : N;
@@ -45125,7 +45108,6 @@ fun relinquishment_N : N;
 fun reliquary_N : N;
 fun relish_N : N;
 fun relish_V2 : V2;
 fun relish_VS : VS;
 fun relistening_N : N;
 fun relive_V2 : V2;
 fun reliving_N : N;
@@ -45215,7 +45197,6 @@ fun renascent_A : A;
 fun rend_V2 : V2;
 fun render_N : N;
 fun render_V2 : V2;
 fun render_VS : VS;
 fun rendering_N : N;
 fun rendezvous_N : N;
 fun rendezvous_V : V;
@@ -45588,7 +45569,7 @@ fun responsiveness_N : N;
 fun rest_N : N;
 fun rest_V : V;
 fun rest_V2 : V2;
-fun rest_VS : VS;
+fun rest_VA : VA;
 fun rest_cure_N : N;
 fun rest_day_N : N;
 fun rest_home_N : N;
@@ -46692,7 +46673,6 @@ fun rugose_A : A;
 fun rugulah_N : N;
 fun ruin_N : N;
 fun ruin_V2 : V2;
 fun ruin_VS : VS;
 fun ruination_N : N;
 fun ruinous_A : A;
 fun rule_N : N;
@@ -46780,7 +46760,7 @@ fun rush_N : N;
 fun rush_V : V;
 fun rush_V2 : V2;
 fun rush_V2V : V2V;
-fun rush_VS : VS;
+fun rush_VV : VV;
 fun rusher_N : N;
 fun rushlight_N : N;
 fun rushlike_A : A;
@@ -48046,7 +48026,7 @@ fun seakale_N : N;
 fun seal_N : N;
 fun seal_V : V;
 fun seal_V2 : V2;
-fun seal_VS : VS;
+fun seal_V2A : V2A;
 fun seal_ring_N : N;
 fun sealant_N : N;
 fun sealer_N : N;
@@ -48687,7 +48667,6 @@ fun service_V2 : V2;
 fun serviceability_N : N;
 fun serviceable_A : A;
 fun serviceman_N : N;
 fun services_N : N;
 fun servicing_N : N;
 fun serviette_N : N;
 fun servile_A : A;
@@ -48727,7 +48706,6 @@ fun settle_N : N;
 fun settle_V : V;
 fun settle_V2 : V2;
 fun settle_VA : VA;
 fun settle_VS : VS;
 fun settlement_N : N;
 fun settler_N : N;
 fun settling_N : N;
@@ -52296,6 +52274,7 @@ fun stigmatize_V2 : V2;
 fun stile_N : N;
 fun stiletto_N : N;
 fun still_A : A;
 fun still_AdA : AdA;
 fun still_AdV : AdV;
 fun still_Adv : Adv;
 fun still_N : N;
@@ -53060,7 +53039,7 @@ fun subterranean_A : A;
 fun subthalamus_N : N;
 fun subtilin_N : N;
 fun subtitle_N : N;
-fun subtitle_VS : VS;
+fun subtitle_V3 : V3;
 fun subtle_A : A;
 fun subtlety_N : N;
 fun subtly_Adv : Adv;
@@ -53589,7 +53568,6 @@ fun survival_N : N;
 fun survivalist_N : N;
 fun survive_V : V;
 fun survive_V2 : V2;
 fun survive_VS : VS;
 fun survivor_N : N;
 fun susan_PN : PN;
 fun susanna_PN : PN;
@@ -54107,7 +54085,7 @@ fun taffy_N : N;
 fun tag_N : N;
 fun tag_V : V;
 fun tag_V2 : V2;
-fun tag_VS : VS;
+fun tag_V3 : V3;
 fun tagalong_N : N;
 fun tagasaste_N : N;
 fun tagger_N : N;
@@ -54187,7 +54165,6 @@ fun talismanic_A : A;
 fun talk_N : N;
 fun talk_V : V;
 fun talk_V2 : V2;
 fun talk_VA : VA;
 fun talkative_A : A;
 fun talker_N : N;
 fun talkie_N : N;
@@ -54340,7 +54317,6 @@ fun tare_N : N;
 fun target_N : N;
 fun target_V2 : V2;
 fun target_V2V : V2V;
 fun target_VS : VS;
 fun tariff_N : N;
 fun tarmac_N : N;
 fun tarmac_V2 : V2;
@@ -54492,7 +54468,6 @@ fun teacake_N : N;
 fun teach_V : V;
 fun teach_V2 : V2;
 fun teach_V2V : V2V;
 fun teach_VS : VS;
 fun teach_in_N : N;
 fun teachable_A : A;
 fun teacher_N : N;
@@ -55091,7 +55066,6 @@ fun therapist_N : N;
 fun therapsid_N : N;
 fun therapy_N : N;
 fun there_Adv : Adv;
 fun there_N : N;
 fun thereabout_Adv : Adv;
 fun thereabouts_Adv : Adv;
 fun thereafter_Adv : Adv;
@@ -55381,7 +55355,6 @@ fun throughway_N : N;
 fun throw_N : N;
 fun throw_V : V;
 fun throw_V2 : V2;
 fun throw_VS : VS;
 fun throw_in_N : N;
 fun throwaway_N : N;
 fun throwback_N : N;
@@ -55726,6 +55699,7 @@ fun tizzy_N : N;
 fun tnt_N : N;
 fun to_Adv : Adv;
 fun to_Prep : Prep;
 fun to_date_Adv : Adv;
 fun to_do_N : N;
 fun toad_N : N;
 fun toad_in_the_hole_N : N;
@@ -56824,7 +56798,6 @@ fun trudge_N : N;
 fun trudge_V : V;
 fun trudger_N : N;
 fun true_A : A;
 fun true_Adv : Adv;
 fun true_N : N;
 fun true_V2 : V2;
 fun true_blue_A : A;
@@ -56834,7 +56807,6 @@ fun truelove_N : N;
 fun trueness_N : N;
 fun truffle_N : N;
 fun truism_N : N;
 fun truly_Adv : Adv;
 fun trump_N : N;
 fun trump_V : V;
 fun trump_V2 : V2;
@@ -56880,7 +56852,6 @@ fun try_N : N;
 fun try_V : V;
 fun try_V2 : V2;
 fun try_V2V : V2V;
 fun try_VS : VS;
 fun try_VV : VV;
 fun try_on_N : N;
 fun try_out_N : N;
@@ -59302,7 +59273,6 @@ fun value_added_A : A;
 fun valueless_A : A;
 fun valuelessness_N : N;
 fun valuer_N : N;
 fun values_N : N;
 fun valve_N : N;
 fun valved_A : A;
 fun valvotomy_N : N;
@@ -60321,6 +60291,7 @@ fun warmongering_N : N;
 fun warmth_N : N;
 fun warn_V : V;
 fun warn_V2 : V2;
 fun warn_V2V : V2V;
 fun warn_VS : VS;
 fun warner_N : N;
 fun warning_N : N;
@@ -60411,7 +60382,8 @@ fun watch_guard_N : N;
 fun watch_key_N : N;
 fun watchband_N : N;
 fun watchdog_N : N;
-fun watcher_N : N;
+fun watcherMasc_N : N;
 fun watcherFem_N : N;
 fun watchful_A : A;
 fun watchfulness_N : N;
 fun watchmaker_N : N;
@@ -62079,9 +62051,9 @@ fun owing_to_Prep : Prep;
 fun prior_to_Prep : Prep;
 fun pursuant_to_Prep : Prep;
 fun rather_than_Prep : Prep;
 fun rather_than_Conj : Conj;
 fun regardless_of_Prep : Prep;
 fun right_of_Prep : Prep;
 fun subsequent_to_Prep : Prep;
 fun thanks_to_Prep : Prep;
 fun that_of_Prep : Prep;
 fun up_to_Prep : Prep;
@@ -62364,7 +62336,7 @@ fun bust_up_V : V;
 fun butt_in_V : V;
 fun butt_out_V : V;
 fun butter_up_V2 : V2;
-fun buy_back_V : V;
+fun buy_back_V2 : V2;
 fun buy_in_V2 : V2;
 fun buy_into_V2 : V2;
 fun buy_off_V2 : V2;
@@ -62375,7 +62347,7 @@ fun buzz_off_V : V;
 fun call_after_V2 : V2;
 fun call_around_V : V;
 fun call_back_V2 : V2;
-fun call_for_V2 : V2;
+fun call_for_V2V : V2V;
 fun call_forth_V2 : V2;
 fun call_in_V : V;
 fun call_in_V2 : V2;
@@ -63784,7 +63756,7 @@ fun plump_for_V2 : V2;
 fun plump_up_V2 : V2;
 fun plump_yourself_down_V : V;
 fun plunge_in_V : V;
-fun point_out_V : V;
+fun point_out_V2 : V2;
 fun point_out_VS : VS;
 fun point_up_V : V;
 fun poke_about_V : V;
@@ -63856,7 +63828,7 @@ fun push_around_V : V;
 fun push_back_V : V;
 fun push_in_V2 : V2;
 fun push_through_V : V;
-fun push_up_V : V;
+fun push_up_V2 : V2;
 fun put_across_V : V;
 fun put_across_V2 : V2;
 fun put_aside_V : V;
@@ -64057,7 +64029,7 @@ fun see_off_V2 : V2;
 fun see_out_V2 : V2;
 fun see_through_V2 : V2;
 fun see_to_V2 : V2;
-fun seek_out_V : V;
+fun seek_out_V2 : V2;
 fun seize_up_V : V;
 fun sell_back_V : V;
 fun sell_off_V2 : V2;