diff --git a/modules/xspec/src/_model_externs_xspec12.inc b/modules/xspec/src/_model_externs_xspec12.inc
index 6a92816..ca80a06 100644
--- a/modules/xspec/src/_model_externs_xspec12.inc
+++ b/modules/xspec/src/_model_externs_xspec12.inc
@@ -11,6 +11,8 @@ extern Fcn_C_Type C_bcoolflow;
 extern Fcn_C_Type C_bcph;
 extern Fcn_C_Type C_bequil;
 extern Fcn_C_Type C_bexpcheb6;
+extern Fcn_C_Type C_bFeKbetafromFourLorentzians;
+extern Fcn_C_Type C_bFeKfromSevenLorentzians;
 extern Fcn_C_Type C_bgaussDem;
 extern Fcn_C_Type C_bgnei;
 extern Fcn_C_Type C_bnei;
@@ -107,7 +109,7 @@ extern Fcn_C_Type C_hatm;
 extern Fcn_f_Type FC_FUNC(jet,JET);
 extern Fcn_C_Type C_kerrbb;
 extern Fcn_C_Type C_kerrd;
-extern Fcn_C_Type C_spin;
+extern Fcn_f_Type FC_FUNC(dospin,DOSPIN);
 extern Fcn_f_Type FC_FUNC(kyconv,KYCONV);
 extern Fcn_f_Type FC_FUNC(kyrline,KYRLINE);
 extern Fcn_C_Type C_laor;
@@ -127,7 +129,7 @@ extern Fcn_C_Type C_nsmax;
 extern Fcn_C_Type C_nsmaxg;
 extern Fcn_C_Type C_nsx;
 extern Fcn_C_Type C_xsnteea;
-extern Fcn_C_Type C_nthcomp;
+extern Fcn_f_Type FC_FUNC(donthcomp,DONTHCOMP);
 extern Fcn_f_Type FC_FUNC(optxagn,OPTXAGN);
 extern Fcn_f_Type FC_FUNC(optxagnf,OPTXAGNF);
 extern Fcn_f_Type FC_FUNC(xspegp,XSPEGP);
@@ -141,6 +143,15 @@ extern Fcn_f_Type FC_FUNC(qsosed,QSOSED);
 extern Fcn_C_Type C_raysmith;
 extern Fcn_f_Type FC_FUNC(xredge,XREDGE);
 extern Fcn_f_Type FC_FUNC(xsrefsch,XSREFSCH);
+extern Fcn_C_Type C_rgsExtendedSource;
+extern Fcn_C_Type C_rgsxsrc;
+extern Fcn_C_Type C_rsapec;
+extern Fcn_C_Type C_rsgaussianLine;
+extern Fcn_C_Type C_rsrnei;
+extern Fcn_C_Type C_rsvapec;
+extern Fcn_C_Type C_rsvrnei;
+extern Fcn_C_Type C_rsvvapec;
+extern Fcn_C_Type C_rsvvrnei;
 extern Fcn_C_Type C_rnei;
 extern Fcn_C_Type C_sedov;
 extern Fcn_C_Type C_sirf;
@@ -166,6 +177,7 @@ extern Fcn_C_Type C_vequil;
 extern Fcn_C_Type C_vgaussDem;
 extern Fcn_C_Type C_vgaussianLine;
 extern Fcn_C_Type C_vgnei;
+extern Fcn_C_Type C_vlorentzianLine;
 extern Fcn_C_Type C_vmeka;
 extern Fcn_C_Type C_vmekal;
 extern Fcn_C_Type C_xsvmcf;
@@ -183,6 +195,7 @@ extern Fcn_C_Type C_vvgaussDem;
 extern Fcn_C_Type C_vvgnei;
 extern Fcn_C_Type C_vvnei;
 extern Fcn_C_Type C_vvnpshock;
+extern Fcn_C_Type C_vvoigtLine;
 extern Fcn_C_Type C_vvpshock;
 extern Fcn_C_Type C_vvrnei;
 extern Fcn_C_Type C_vvsedov;
@@ -192,13 +205,21 @@ extern Fcn_C_Type C_vwDem;
 extern Fcn_C_Type C_wDem;
 extern Fcn_C_Type C_zagauss;
 extern Fcn_f_Type FC_FUNC(xszbod,XSZBOD);
+extern Fcn_C_Type C_zbFeKbetafromFourLorentzians;
+extern Fcn_C_Type C_zbFeKfromSevenLorentzians;
 extern Fcn_C_Type C_zBrokenPowerLaw;
 extern Fcn_f_Type FC_FUNC(xszbrm,XSZBRM);
 extern Fcn_C_Type C_zcutoffPowerLaw;
+extern Fcn_C_Type C_zFeKbetafromFourLorentzians;
+extern Fcn_C_Type C_zFeKfromSevenLorentzians;
 extern Fcn_C_Type C_xszgau;
 extern Fcn_C_Type C_zkerrbb;
 extern Fcn_C_Type C_zLogpar;
+extern Fcn_C_Type C_zlorentzianLine;
 extern Fcn_C_Type C_zpowerLaw;
+extern Fcn_C_Type C_zvlorentzianLine;
+extern Fcn_C_Type C_zvoigtLine;
+extern Fcn_C_Type C_zvvoigtLine;
 extern Fcn_C_Type C_xsabsori;
 extern Fcn_C_Type C_acisabs;
 extern Fcn_f_Type FC_FUNC(xscnst,XSCNST);
@@ -216,6 +237,7 @@ extern Fcn_F_Type FC_FUNC(ismabs,ISMABS);
 extern Fcn_F_Type FC_FUNC(ismdust,ISMDUST);
 extern Fcn_C_Type C_logconst;
 extern Fcn_C_Type C_log10con;
+extern Fcn_C_Type C_lorentzianAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(xslyman,XSLYMAN);
 extern Fcn_f_Type FC_FUNC(xsntch,XSNTCH);
 extern Fcn_F_Type FC_FUNC(olivineabs,OLIVINEABS);
@@ -225,7 +247,7 @@ extern Fcn_f_Type FC_FUNC(xsplab,XSPLAB);
 extern Fcn_C_Type C_polconst;
 extern Fcn_C_Type C_pollin;
 extern Fcn_C_Type C_polpow;
-extern Fcn_C_Type C_xspwab;
+extern Fcn_f_Type FC_FUNC(xspwab,XSPWAB);
 extern Fcn_f_Type FC_FUNC(xscred,XSCRED);
 extern Fcn_f_Type FC_FUNC(xssmdg,XSSMDG);
 extern Fcn_C_Type C_superExpCutoff;
@@ -242,7 +264,10 @@ extern Fcn_C_Type C_tbrel;
 extern Fcn_f_Type FC_FUNC(xsred,XSRED);
 extern Fcn_f_Type FC_FUNC(xsabsv,XSABSV);
 extern Fcn_C_Type C_vgaussianAbsorptionLine;
+extern Fcn_C_Type C_vlorentzianAbsorptionLine;
+extern Fcn_C_Type C_voigtAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(xsvphb,XSVPHB);
+extern Fcn_C_Type C_vvoigtAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(xsabsw,XSABSW);
 extern Fcn_f_Type FC_FUNC(xswnab,XSWNAB);
 extern Fcn_f_Type FC_FUNC(xsxirf,XSXIRF);
@@ -253,8 +278,12 @@ extern Fcn_f_Type FC_FUNC(xszedg,XSZEDG);
 extern Fcn_C_Type C_zgaussianAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(xszhcu,XSZHCU);
 extern Fcn_f_Type FC_FUNC(zigm,ZIGM);
+extern Fcn_C_Type C_zlorentzianAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(xszabp,XSZABP);
 extern Fcn_f_Type FC_FUNC(xszphb,XSZPHB);
+extern Fcn_C_Type C_zvlorentzianAbsorptionLine;
+extern Fcn_C_Type C_zvoigtAbsorptionLine;
+extern Fcn_C_Type C_zvvoigtAbsorptionLine;
 extern Fcn_f_Type FC_FUNC(zxipab,ZXIPAB);
 extern Fcn_C_Type C_zxipcf;
 extern Fcn_f_Type FC_FUNC(xszcrd,XSZCRD);
@@ -282,7 +311,6 @@ extern Fcn_C_Type C_PartialCovering;
 extern Fcn_C_Type C_rdblur;
 extern Fcn_C_Type C_reflct;
 extern Fcn_C_Type C_rfxconv;
-extern Fcn_f_Type FC_FUNC(rgsxsrc,RGSXSRC);
 extern Fcn_C_Type C_simpl;
 extern Fcn_f_Type FC_FUNC(thcompf,THCOMPF);
 extern Fcn_C_Type C_vashift;
diff --git a/modules/xspec/src/_model_table_xspec12.inc b/modules/xspec/src/_model_table_xspec12.inc
index 82171b5..3bfb92c 100644
--- a/modules/xspec/src/_model_table_xspec12.inc
+++ b/modules/xspec/src/_model_table_xspec12.inc
@@ -11,6 +11,8 @@
 {"bcph", (fptr_type *) C_bcph, "_xspec_add_C_hook", NULL, 0},
 {"bequil", (fptr_type *) C_bequil, "_xspec_add_C_hook", NULL, 0},
 {"bexpcheb6", (fptr_type *) C_bexpcheb6, "_xspec_add_C_hook", NULL, 0},
+{"bfekblor", (fptr_type *) C_bFeKbetafromFourLorentzians, "_xspec_add_C_hook", NULL, 0},
+{"bfeklor", (fptr_type *) C_bFeKfromSevenLorentzians, "_xspec_add_C_hook", NULL, 0},
 {"bgadem", (fptr_type *) C_bgaussDem, "_xspec_add_C_hook", NULL, 0},
 {"bgnei", (fptr_type *) C_bgnei, "_xspec_add_C_hook", NULL, 0},
 {"bnei", (fptr_type *) C_bnei, "_xspec_add_C_hook", NULL, 0},
@@ -107,7 +109,7 @@
 {"jet", (fptr_type *) FC_FUNC(jet,JET), "_xspec_add_f_hook", NULL, 0},
 {"kerrbb", (fptr_type *) C_kerrbb, "_xspec_add_C_hook", NULL, 0},
 {"kerrd", (fptr_type *) C_kerrd, "_xspec_add_C_hook", NULL, 0},
-{"kerrdisk", (fptr_type *) C_spin, "_xspec_add_C_hook", NULL, 0},
+{"kerrdisk", (fptr_type *) FC_FUNC(dospin,DOSPIN), "_xspec_add_f_hook", NULL, 0},
 {"kyconv", (fptr_type *) FC_FUNC(kyconv,KYCONV), "_xspec_con_f_hook", NULL, 0},
 {"kyrline", (fptr_type *) FC_FUNC(kyrline,KYRLINE), "_xspec_add_f_hook", NULL, 0},
 {"laor", (fptr_type *) C_laor, "_xspec_add_C_hook", NULL, 0},
@@ -127,7 +129,7 @@
 {"nsmaxg", (fptr_type *) C_nsmaxg, "_xspec_add_C_hook", NULL, 0},
 {"nsx", (fptr_type *) C_nsx, "_xspec_add_C_hook", NULL, 0},
 {"nteea", (fptr_type *) C_xsnteea, "_xspec_add_C_hook", NULL, 0},
-{"nthComp", (fptr_type *) C_nthcomp, "_xspec_add_C_hook", NULL, 0},
+{"nthComp", (fptr_type *) FC_FUNC(donthcomp,DONTHCOMP), "_xspec_add_f_hook", NULL, 0},
 {"optxagn", (fptr_type *) FC_FUNC(optxagn,OPTXAGN), "_xspec_add_f_hook", NULL, 0},
 {"optxagnf", (fptr_type *) FC_FUNC(optxagnf,OPTXAGNF), "_xspec_add_f_hook", NULL, 0},
 {"pegpwrlw", (fptr_type *) FC_FUNC(xspegp,XSPEGP), "_xspec_add_f_hook", NULL, 0},
@@ -141,6 +143,15 @@
 {"raymond", (fptr_type *) C_raysmith, "_xspec_add_C_hook", NULL, 0},
 {"redge", (fptr_type *) FC_FUNC(xredge,XREDGE), "_xspec_add_f_hook", NULL, 0},
 {"refsch", (fptr_type *) FC_FUNC(xsrefsch,XSREFSCH), "_xspec_add_f_hook", NULL, 0},
+{"rgsext", (fptr_type *) C_rgsExtendedSource, "_xspec_con_C_hook", NULL, 0},
+{"rgsxsrc", (fptr_type *) C_rgsxsrc, "_xspec_con_C_hook", NULL, 0},
+{"rsapec", (fptr_type *) C_rsapec, "_xspec_add_C_hook", NULL, 0},
+{"rsgaussian", (fptr_type *) C_rsgaussianLine, "_xspec_add_C_hook", NULL, 0},
+{"rsrnei", (fptr_type *) C_rsrnei, "_xspec_add_C_hook", NULL, 0},
+{"rsvapec", (fptr_type *) C_rsvapec, "_xspec_add_C_hook", NULL, 0},
+{"rsvrnei", (fptr_type *) C_rsvrnei, "_xspec_add_C_hook", NULL, 0},
+{"rsvvapec", (fptr_type *) C_rsvvapec, "_xspec_add_C_hook", NULL, 0},
+{"rsvvrnei", (fptr_type *) C_rsvvrnei, "_xspec_add_C_hook", NULL, 0},
 {"rnei", (fptr_type *) C_rnei, "_xspec_add_C_hook", NULL, 0},
 {"sedov", (fptr_type *) C_sedov, "_xspec_add_C_hook", NULL, 0},
 {"sirf", (fptr_type *) C_sirf, "_xspec_add_C_hook", NULL, 0},
@@ -166,6 +177,7 @@
 {"vgadem", (fptr_type *) C_vgaussDem, "_xspec_add_C_hook", NULL, 0},
 {"vgaussian", (fptr_type *) C_vgaussianLine, "_xspec_add_C_hook", NULL, 0},
 {"vgnei", (fptr_type *) C_vgnei, "_xspec_add_C_hook", NULL, 0},
+{"vlorentz", (fptr_type *) C_vlorentzianLine, "_xspec_add_C_hook", NULL, 0},
 {"vmeka", (fptr_type *) C_vmeka, "_xspec_add_C_hook", NULL, 0},
 {"vmekal", (fptr_type *) C_vmekal, "_xspec_add_C_hook", NULL, 0},
 {"vmcflow", (fptr_type *) C_xsvmcf, "_xspec_add_C_hook", NULL, 0},
@@ -183,6 +195,7 @@
 {"vvgnei", (fptr_type *) C_vvgnei, "_xspec_add_C_hook", NULL, 0},
 {"vvnei", (fptr_type *) C_vvnei, "_xspec_add_C_hook", NULL, 0},
 {"vvnpshock", (fptr_type *) C_vvnpshock, "_xspec_add_C_hook", NULL, 0},
+{"vvoigt", (fptr_type *) C_vvoigtLine, "_xspec_add_C_hook", NULL, 0},
 {"vvpshock", (fptr_type *) C_vvpshock, "_xspec_add_C_hook", NULL, 0},
 {"vvrnei", (fptr_type *) C_vvrnei, "_xspec_add_C_hook", NULL, 0},
 {"vvsedov", (fptr_type *) C_vvsedov, "_xspec_add_C_hook", NULL, 0},
@@ -192,13 +205,21 @@
 {"wdem", (fptr_type *) C_wDem, "_xspec_add_C_hook", NULL, 0},
 {"zagauss", (fptr_type *) C_zagauss, "_xspec_add_C_hook", NULL, 0},
 {"zbbody", (fptr_type *) FC_FUNC(xszbod,XSZBOD), "_xspec_add_f_hook", NULL, 0},
+{"zbfekblor", (fptr_type *) C_zbFeKbetafromFourLorentzians, "_xspec_add_C_hook", NULL, 0},
+{"zbfeklor", (fptr_type *) C_zbFeKfromSevenLorentzians, "_xspec_add_C_hook", NULL, 0},
 {"zbknpower", (fptr_type *) C_zBrokenPowerLaw, "_xspec_add_C_hook", NULL, 0},
 {"zbremss", (fptr_type *) FC_FUNC(xszbrm,XSZBRM), "_xspec_add_f_hook", NULL, 0},
 {"zcutoffpl", (fptr_type *) C_zcutoffPowerLaw, "_xspec_add_C_hook", NULL, 0},
+{"zfekblor", (fptr_type *) C_zFeKbetafromFourLorentzians, "_xspec_add_C_hook", NULL, 0},
+{"zfeklor", (fptr_type *) C_zFeKfromSevenLorentzians, "_xspec_add_C_hook", NULL, 0},
 {"zgauss", (fptr_type *) C_xszgau, "_xspec_add_C_hook", NULL, 0},
 {"zkerrbb", (fptr_type *) C_zkerrbb, "_xspec_add_C_hook", NULL, 0},
 {"zlogpar", (fptr_type *) C_zLogpar, "_xspec_add_C_hook", NULL, 0},
+{"zlorentz", (fptr_type *) C_zlorentzianLine, "_xspec_add_C_hook", NULL, 0},
 {"zpowerlw", (fptr_type *) C_zpowerLaw, "_xspec_add_C_hook", NULL, 0},
+{"zvlorentz", (fptr_type *) C_zvlorentzianLine, "_xspec_add_C_hook", NULL, 0},
+{"zvoigt", (fptr_type *) C_zvoigtLine, "_xspec_add_C_hook", NULL, 0},
+{"zvvoigt", (fptr_type *) C_zvvoigtLine, "_xspec_add_C_hook", NULL, 0},
 {"absori", (fptr_type *) C_xsabsori, "_xspec_mul_C_hook", NULL, 0},
 {"acisabs", (fptr_type *) C_acisabs, "_xspec_mul_C_hook", NULL, 0},
 {"constant", (fptr_type *) FC_FUNC(xscnst,XSCNST), "_xspec_mul_f_hook", NULL, 0},
@@ -216,6 +237,7 @@
 {"ismdust", (fptr_type *) FC_FUNC(ismdust,ISMDUST), "_xspec_mul_F_hook", NULL, 0},
 {"logconst", (fptr_type *) C_logconst, "_xspec_mul_C_hook", NULL, 0},
 {"log10con", (fptr_type *) C_log10con, "_xspec_mul_C_hook", NULL, 0},
+{"lorabs", (fptr_type *) C_lorentzianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"lyman", (fptr_type *) FC_FUNC(xslyman,XSLYMAN), "_xspec_mul_f_hook", NULL, 0},
 {"notch", (fptr_type *) FC_FUNC(xsntch,XSNTCH), "_xspec_mul_f_hook", NULL, 0},
 {"olivineabs", (fptr_type *) FC_FUNC(olivineabs,OLIVINEABS), "_xspec_mul_F_hook", NULL, 0},
@@ -225,7 +247,7 @@
 {"polconst", (fptr_type *) C_polconst, "_xspec_mul_C_hook", NULL, 0},
 {"pollin", (fptr_type *) C_pollin, "_xspec_mul_C_hook", NULL, 0},
 {"polpow", (fptr_type *) C_polpow, "_xspec_mul_C_hook", NULL, 0},
-{"pwab", (fptr_type *) C_xspwab, "_xspec_mul_C_hook", NULL, 0},
+{"pwab", (fptr_type *) FC_FUNC(xspwab,XSPWAB), "_xspec_mul_f_hook", NULL, 0},
 {"redden", (fptr_type *) FC_FUNC(xscred,XSCRED), "_xspec_mul_f_hook", NULL, 0},
 {"smedge", (fptr_type *) FC_FUNC(xssmdg,XSSMDG), "_xspec_mul_f_hook", NULL, 0},
 {"spexpcut", (fptr_type *) C_superExpCutoff, "_xspec_mul_C_hook", NULL, 0},
@@ -242,7 +264,10 @@
 {"uvred", (fptr_type *) FC_FUNC(xsred,XSRED), "_xspec_mul_f_hook", NULL, 0},
 {"varabs", (fptr_type *) FC_FUNC(xsabsv,XSABSV), "_xspec_mul_f_hook", NULL, 0},
 {"vgabs", (fptr_type *) C_vgaussianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
+{"vlorabs", (fptr_type *) C_vlorentzianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
+{"voigtabs", (fptr_type *) C_voigtAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"vphabs", (fptr_type *) FC_FUNC(xsvphb,XSVPHB), "_xspec_mul_f_hook", NULL, 0},
+{"vvoigtabs", (fptr_type *) C_vvoigtAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"wabs", (fptr_type *) FC_FUNC(xsabsw,XSABSW), "_xspec_mul_f_hook", NULL, 0},
 {"wndabs", (fptr_type *) FC_FUNC(xswnab,XSWNAB), "_xspec_mul_f_hook", NULL, 0},
 {"xion", (fptr_type *) FC_FUNC(xsxirf,XSXIRF), "_xspec_mul_f_hook", NULL, 0},
@@ -253,8 +278,12 @@
 {"zgabs", (fptr_type *) C_zgaussianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"zhighect", (fptr_type *) FC_FUNC(xszhcu,XSZHCU), "_xspec_mul_f_hook", NULL, 0},
 {"zigm", (fptr_type *) FC_FUNC(zigm,ZIGM), "_xspec_mul_f_hook", NULL, 0},
+{"zlorabs", (fptr_type *) C_zlorentzianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"zpcfabs", (fptr_type *) FC_FUNC(xszabp,XSZABP), "_xspec_mul_f_hook", NULL, 0},
 {"zphabs", (fptr_type *) FC_FUNC(xszphb,XSZPHB), "_xspec_mul_f_hook", NULL, 0},
+{"zvlorabs", (fptr_type *) C_zvlorentzianAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
+{"zvoigtabs", (fptr_type *) C_zvoigtAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
+{"zvvoigtabs", (fptr_type *) C_zvvoigtAbsorptionLine, "_xspec_mul_C_hook", NULL, 0},
 {"zxipab", (fptr_type *) FC_FUNC(zxipab,ZXIPAB), "_xspec_mul_f_hook", NULL, 0},
 {"zxipcf", (fptr_type *) C_zxipcf, "_xspec_mul_C_hook", NULL, 0},
 {"zredden", (fptr_type *) FC_FUNC(xszcrd,XSZCRD), "_xspec_mul_f_hook", NULL, 0},
@@ -282,7 +311,6 @@
 {"rdblur", (fptr_type *) C_rdblur, "_xspec_con_C_hook", NULL, 0},
 {"reflect", (fptr_type *) C_reflct, "_xspec_con_C_hook", NULL, 0},
 {"rfxconv", (fptr_type *) C_rfxconv, "_xspec_con_C_hook", NULL, 0},
-{"rgsxsrc", (fptr_type *) FC_FUNC(rgsxsrc,RGSXSRC), "_xspec_con_f_hook", NULL, 0},
 {"simpl", (fptr_type *) C_simpl, "_xspec_con_C_hook", NULL, 0},
 {"thcomp", (fptr_type *) FC_FUNC(thcompf,THCOMPF), "_xspec_con_f_hook", NULL, 0},
 {"vashift", (fptr_type *) C_vashift, "_xspec_con_C_hook", NULL, 0},
diff --git a/modules/xspec/src/_names_xspec12.dat b/modules/xspec/src/_names_xspec12.dat
index 3d9a9be..e272bf7 100644
--- a/modules/xspec/src/_names_xspec12.dat
+++ b/modules/xspec/src/_names_xspec12.dat
@@ -10,6 +10,8 @@ bcoolflow
 bcph
 bequil
 bexpcheb6
+bfekblor
+bfeklor
 bgadem
 bgnei
 bnei
@@ -140,6 +142,15 @@ qsosed
 raymond
 redge
 refsch
+rgsext
+rgsxsrc
+rsapec
+rsgaussian
+rsrnei
+rsvapec
+rsvrnei
+rsvvapec
+rsvvrnei
 rnei
 sedov
 sirf
@@ -165,6 +176,7 @@ vequil
 vgadem
 vgaussian
 vgnei
+vlorentz
 vmeka
 vmekal
 vmcflow
@@ -182,6 +194,7 @@ vvgadem
 vvgnei
 vvnei
 vvnpshock
+vvoigt
 vvpshock
 vvrnei
 vvsedov
@@ -191,13 +204,21 @@ vwdem
 wdem
 zagauss
 zbbody
+zbfekblor
+zbfeklor
 zbknpower
 zbremss
 zcutoffpl
+zfekblor
+zfeklor
 zgauss
 zkerrbb
 zlogpar
+zlorentz
 zpowerlw
+zvlorentz
+zvoigt
+zvvoigt
 absori
 acisabs
 constant
@@ -215,6 +236,7 @@ ismabs
 ismdust
 logconst
 log10con
+lorabs
 lyman
 notch
 olivineabs
@@ -241,7 +263,10 @@ TBrel
 uvred
 varabs
 vgabs
+vlorabs
+voigtabs
 vphabs
+vvoigtabs
 wabs
 wndabs
 xion
@@ -252,8 +277,12 @@ zedge
 zgabs
 zhighect
 zigm
+zlorabs
 zpcfabs
 zphabs
+zvlorabs
+zvoigtabs
+zvvoigtabs
 zxipab
 zxipcf
 zredden
@@ -281,7 +310,6 @@ partcov
 rdblur
 reflect
 rfxconv
-rgsxsrc
 simpl
 thcomp
 vashift