diff --git a/Release/PRC8_20240909.7z b/Release/PRC8_20240909.7z
new file mode 100644
index 00000000..798a8683
Binary files /dev/null and b/Release/PRC8_20240909.7z differ
diff --git a/Release/PRC8_20240904.7z b/_backup/PRC8_20240904.7z
similarity index 100%
rename from Release/PRC8_20240904.7z
rename to _backup/PRC8_20240904.7z
diff --git a/nwn/nwnprc/trunk/2das/cls_feat_shadow.2DA b/nwn/nwnprc/trunk/2das/cls_feat_shadow.2DA
index 94461663..22643586 100644
--- a/nwn/nwnprc/trunk/2das/cls_feat_shadow.2DA
+++ b/nwn/nwnprc/trunk/2das/cls_feat_shadow.2DA
@@ -1,69 +1,73 @@
 2DA V2.0
 
-   FeatLabel                            FeatIndex List GrantedOnLevel OnMenu 
-0  DefArrow                             8         0    -1             0      
-1  Quicken                              29        0    -1             0      
-2  TwoWeap                              41        0    -1             0      
-3  Ambidex                              1         0    -1             0      
-4  HIDE_IN_PLAIN_SIGHT                  433       3    1              0      
-5  SHADOW_DAZE                          434       3    3              1      
-6  SUMMON_SHADOW                        435       3    3              1      
-7  SHADOW_EVADE                         436       3    4              1      
-8  Evasion                              206       3    2              0      
-9  darkvision                           228       3    2              0      
-10 UncannyDodge1                        195       3    2              0      
-11 DefensiveRoll                        223       3    5              0      
-12 UncannyDodge2                        251       3    5              0      
-13 SlipperMind                          259       3    7              0      
-14 ImprovedEvasion                      212       3    10             0      
-15 UncannyDodge3                        252       3    10             0      
-16 WeapProfSim                          46        3    1              0      
-17 WeapProfSim_Dart                     7914      3    1              0      
-18 WeapProfSim_Light_Mace               7908      3    1              0      
-19 WeapProfSim_Morningstar              7923      3    1              0      
-20 WeapProfSim_Shortspear               7927      3    1              0      
-21 WeapProfSim_Sickle                   7929      3    1              0      
-22 WeapProfSim_Sling                    7930      3    1              0      
-23 WP_Goad                              7949      3    1              0      
-24 WP_Heavy_Mace                        7946      3    1              0      
-25 WP_Katar                             7945      3    1              0      
-26 WP_Sap                               7944      3    1              0      
-27 ArmProfLgt                           3         3    1              0      
-28 FEAT_EPIC_BLINDING_SPEED             491       1    -1             1      
-29 FEAT_EPIC_SKILL_FOCUS_APPRAISE       588       1    -1             0      
-30 FEAT_EPIC_SKILL_FOCUS_CONCENTRATION  589       1    -1             0      
-31 FEAT_EPIC_SKILL_FOCUS_CRAFT_TRAP     590       1    -1             0      
-32 FEAT_EPIC_SKILL_FOCUS_DISABLETRAP    591       1    -1             0      
-33 FEAT_EPIC_SKILL_FOCUS_DISCIPLINE     592       1    -1             0      
-34 FEAT_EPIC_SKILL_FOCUS_HEAL           593       1    -1             0      
-35 FEAT_EPIC_SKILL_FOCUS_HIDE           594       1    -1             0      
-36 FEAT_EPIC_SKILL_FOCUS_LISTEN         595       1    -1             0      
-37 FEAT_EPIC_SKILL_FOCUS_LORE           596       1    -1             0      
-38 FEAT_EPIC_SKILL_FOCUS_MOVESILENTLY   597       1    -1             0      
-39 FEAT_EPIC_SKILL_FOCUS_OPENLOCK       598       1    -1             0      
-40 FEAT_EPIC_SKILL_FOCUS_PARRY          599       1    -1             0      
-41 FEAT_EPIC_SKILL_FOCUS_PERSUADE       601       1    -1             0      
-42 FEAT_EPIC_SKILL_FOCUS_PICKPOCKET     602       1    -1             0      
-43 FEAT_EPIC_SKILL_FOCUS_SEARCH         603       1    -1             0      
-44 FEAT_EPIC_SKILL_FOCUS_SETTRAP        604       1    -1             0      
-45 FEAT_EPIC_SKILL_FOCUS_SPELLCRAFT     605       1    -1             0      
-46 FEAT_EPIC_SKILL_FOCUS_SPOT           606       1    -1             0      
-47 FEAT_EPIC_SKILL_FOCUS_TAUNT          607       1    -1             0      
-48 FEAT_EPIC_SKILL_FOCUS_TUMBLE         608       1    -1             0      
-49 FEAT_EPIC_SKILL_FOCUS_USEMAGICDEVICE 609       1    -1             0      
-50 FEAT_EPIC_SELF_CONCEALMENT_10        748       1    -1             0      
-51 FEAT_EPIC_SELF_CONCEALMENT_20        749       1    -1             0      
-52 FEAT_EPIC_SELF_CONCEALMENT_30        750       1    -1             0      
-53 FEAT_EPIC_SELF_CONCEALMENT_40        751       1    -1             0      
-54 FEAT_EPIC_SELF_CONCEALMENT_50        752       1    -1             0      
-55 FEAT_EPIC_SUPERIOR_INITIATIVE        753       1    -1             0      
-56 FEAT_EPIC_DODGE                      856       1    -1             0      
-57 FEAT_IMPROVED_WHIRLWIND              868       1    -1             0      
-58 FEAT_EPIC_SKILL_FOCUS_CRAFT_ARMOR    913       1    -1             0      
-59 FEAT_EPIC_SKILL_FOCUS_CRAFT_WEAPON   914       1    -1             0      
-60 FEAT_EPIC_SKILL_FOCUS_BLUFF          917       1    -1             0      
-61 FEAT_EPIC_SKILL_FOCUS_INTIMIDATE     918       1    -1             0      
-62 FEAT_EPIC_SHADOWDANCER               980       3    11             0      
-63 FEAT_EPIC_EPIC_SHADOWLORD            1002      2    -1             0      
-64 FEAT_EPIC_REFLEXES                   585       1    -1             0      
-65 FEAT_LINGERING_DAMAGE                3099      0    -1             0      
+           FeatLabel                            FeatIndex List GrantedOnLevel OnMenu 
+0          DefArrow                             8         0    -1             0      
+1          Quicken                              29        0    -1             0      
+2          TwoWeap                              41        0    -1             0      
+3          Ambidex                              1         0    -1             0      
+4          HIDE_IN_PLAIN_SIGHT                  433       3    1              0      
+5          SHADOW_DAZE                          434       3    3              1      
+6          SUMMON_SHADOW                        435       3    3              1      
+7          SHADOW_EVADE                         436       3    4              1      
+8          Evasion                              206       3    2              0      
+9          darkvision                           228       3    2              0      
+10         UncannyDodge1                        195       3    2              0      
+11         DefensiveRoll                        223       3    5              0      
+12         UncannyDodge2                        251       3    5              0      
+13         SlipperMind                          259       3    7              0      
+14         ImprovedEvasion                      212       3    10             0      
+15         UncannyDodge3                        252       3    10             0      
+16         WeapProfSim_Dart                     7914      3    1              0      
+17         WeapProfSim_Light_Mace               7908      3    1              0      
+18         WeapProfSim_Morningstar              7923      3    1              0      
+19         WeapProfSim_Sickle                   7929      3    1              0      
+20         WeapProfSim_Sling                    7930      3    1              0      
+21         WP_Katar                             7945      3    1              0      
+22         WP_Sap                               7944      3    1              0      
+23         WP_LightCrossbow                     7951      3    1              0      
+24         WP_HeavyCrossbow                     7952      3    1              0      
+25         WP_Quarterstaff                      7953      3    1              0      
+26         WP_Dagger                            7954      3    1              0      
+27         WP_Club                              7955      3    1              0      
+28         WP_Shortsword                        7901      3    1              0      
+29         WP_Shortbow                          7910      3    1              0      
+30         WP_Rapier                            7924      3    1              0      
+31         ArmProfLgt                           3         3    1              0      
+32         FEAT_EPIC_BLINDING_SPEED             491       1    -1             1      
+33         FEAT_EPIC_SKILL_FOCUS_APPRAISE       588       1    -1             0      
+34         FEAT_EPIC_SKILL_FOCUS_CONCENTRATION  589       1    -1             0      
+35         FEAT_EPIC_SKILL_FOCUS_CRAFT_TRAP     590       1    -1             0      
+36         FEAT_EPIC_SKILL_FOCUS_DISABLETRAP    591       1    -1             0      
+37         FEAT_EPIC_SKILL_FOCUS_DISCIPLINE     592       1    -1             0      
+38         FEAT_EPIC_SKILL_FOCUS_HEAL           593       1    -1             0      
+39         FEAT_EPIC_SKILL_FOCUS_HIDE           594       1    -1             0      
+40         FEAT_EPIC_SKILL_FOCUS_LISTEN         595       1    -1             0      
+41         FEAT_EPIC_SKILL_FOCUS_LORE           596       1    -1             0      
+42         FEAT_EPIC_SKILL_FOCUS_MOVESILENTLY   597       1    -1             0      
+43         FEAT_EPIC_SKILL_FOCUS_OPENLOCK       598       1    -1             0      
+44         FEAT_EPIC_SKILL_FOCUS_PARRY          599       1    -1             0      
+45         FEAT_EPIC_SKILL_FOCUS_PERSUADE       601       1    -1             0      
+46         FEAT_EPIC_SKILL_FOCUS_PICKPOCKET     602       1    -1             0      
+47         FEAT_EPIC_SKILL_FOCUS_SEARCH         603       1    -1             0      
+48         FEAT_EPIC_SKILL_FOCUS_SETTRAP        604       1    -1             0      
+49         FEAT_EPIC_SKILL_FOCUS_SPELLCRAFT     605       1    -1             0      
+50         FEAT_EPIC_SKILL_FOCUS_SPOT           606       1    -1             0      
+51         FEAT_EPIC_SKILL_FOCUS_TAUNT          607       1    -1             0      
+52         FEAT_EPIC_SKILL_FOCUS_TUMBLE         608       1    -1             0      
+53         FEAT_EPIC_SKILL_FOCUS_USEMAGICDEVICE 609       1    -1             0      
+54         FEAT_EPIC_SELF_CONCEALMENT_10        748       1    -1             0      
+55         FEAT_EPIC_SELF_CONCEALMENT_20        749       1    -1             0      
+56         FEAT_EPIC_SELF_CONCEALMENT_30        750       1    -1             0      
+57         FEAT_EPIC_SELF_CONCEALMENT_40        751       1    -1             0      
+58         FEAT_EPIC_SELF_CONCEALMENT_50        752       1    -1             0      
+59         FEAT_EPIC_SUPERIOR_INITIATIVE        753       1    -1             0      
+60         FEAT_EPIC_DODGE                      856       1    -1             0      
+61         FEAT_IMPROVED_WHIRLWIND              868       1    -1             0      
+62         FEAT_EPIC_SKILL_FOCUS_CRAFT_ARMOR    913       1    -1             0      
+63         FEAT_EPIC_SKILL_FOCUS_CRAFT_WEAPON   914       1    -1             0      
+64         FEAT_EPIC_SKILL_FOCUS_BLUFF          917       1    -1             0      
+65         FEAT_EPIC_SKILL_FOCUS_INTIMIDATE     918       1    -1             0      
+66         FEAT_EPIC_SHADOWDANCER               980       3    11             0      
+67         FEAT_EPIC_EPIC_SHADOWLORD            1002      2    -1             0      
+68         FEAT_EPIC_REFLEXES                   585       1    -1             0      
+69         FEAT_LINGERING_DAMAGE                3099      0    -1             0      
diff --git a/nwn/nwnprc/trunk/2das/feat.2da b/nwn/nwnprc/trunk/2das/feat.2da
index acd852c1..1cd1bc00 100644
--- a/nwn/nwnprc/trunk/2das/feat.2da
+++ b/nwn/nwnprc/trunk/2das/feat.2da
@@ -7952,11 +7952,11 @@
 7948       WP_Double_Scimitar                                        16834198 16834259    ife_wepprof_dsc   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    44        1       ****       87         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_DOUBLE_SCIMITAR                  1               ****        ****     ****          ****     ****        0          1         
 7949       WP_Goad                                                   16834207 16834257    ife_wepprof_goa   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_GOAD                             1               ****        ****     ****          ****     ****        0          1         
 7950       WP_EagleClaw                                              16793721 16834259    ife_wepprof_ssw   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    44        1       ****       87         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_EAGLE_CLAW                       1               ****        ****     ****          ****     ****        0          1         
-7951       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
-7952       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
-7953       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
-7954       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
-7955       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
+7951       WP_LightCrossbow                                          16793730 16834257    ife_wepprof_lxb   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_LIGHT_XBOW                       1               ****        ****     ****          ****     ****        0          1         
+7952       WP_HeavyCrossbow                                          16793731 16834257    ife_wepprof_hxb   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_HEAVY_XBOW                       1               ****        ****     ****          ****     ****        0          1         
+7953       WP_Quarterstaff                                           16793732 16834257    ife_wepprof_sta   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_QUARTERSTAFF                     1               ****        ****     ****          ****     ****        0          1         
+7954       WP_Dagger                                                 16793733 16834257    ife_wepprof_dag   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_DAGGER                           1               ****        ****     ****          ****     ****        0          1         
+7955       WP_Club                                                   16793734 16834257    ife_wepprof_clu   ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        0            0            1                ****     ****  ****    46        1       ****       85         ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              FEAT_WEAPON_PROFICIENCY_CLUB                             1               ****        ****     ****          ****     ****        0          1         
 7956       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
 7957       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
 7958       ReservedForISCAndESS                                      ****     ****        ****              ****           ****   ****   ****   ****   ****   ****   ****        ****        ****        ****         ****         ****             ****     ****  ****    ****      ****    ****       ****       ****       ****       ****       ****       ****       ****       ****     ****             ****      ****              ****                                                     ****            ****        ****     ****          ****     ****        ****       1         
diff --git a/nwn/nwnprc/trunk/gfx/ife_wepprof_clu.tga b/nwn/nwnprc/trunk/gfx/ife_wepprof_clu.tga
new file mode 100644
index 00000000..d11fd588
Binary files /dev/null and b/nwn/nwnprc/trunk/gfx/ife_wepprof_clu.tga differ
diff --git a/nwn/nwnprc/trunk/gfx/ife_wepprof_dag.tga b/nwn/nwnprc/trunk/gfx/ife_wepprof_dag.tga
new file mode 100644
index 00000000..fb3dab93
Binary files /dev/null and b/nwn/nwnprc/trunk/gfx/ife_wepprof_dag.tga differ
diff --git a/nwn/nwnprc/trunk/gfx/ife_wepprof_hxb.tga b/nwn/nwnprc/trunk/gfx/ife_wepprof_hxb.tga
new file mode 100644
index 00000000..82de647d
Binary files /dev/null and b/nwn/nwnprc/trunk/gfx/ife_wepprof_hxb.tga differ
diff --git a/nwn/nwnprc/trunk/gfx/ife_wepprof_lxb.tga b/nwn/nwnprc/trunk/gfx/ife_wepprof_lxb.tga
new file mode 100644
index 00000000..2dc87c0f
Binary files /dev/null and b/nwn/nwnprc/trunk/gfx/ife_wepprof_lxb.tga differ
diff --git a/nwn/nwnprc/trunk/gfx/ife_wepprof_sta.tga b/nwn/nwnprc/trunk/gfx/ife_wepprof_sta.tga
new file mode 100644
index 00000000..7531b40d
Binary files /dev/null and b/nwn/nwnprc/trunk/gfx/ife_wepprof_sta.tga differ
diff --git a/nwn/nwnprc/trunk/include/prc_feat_const.nss b/nwn/nwnprc/trunk/include/prc_feat_const.nss
index 570044f1..c8dfc028 100644
--- a/nwn/nwnprc/trunk/include/prc_feat_const.nss
+++ b/nwn/nwnprc/trunk/include/prc_feat_const.nss
@@ -371,6 +371,12 @@ const int FEAT_WEAPON_PROFICIENCY_MAUL              = 7947;
 const int FEAT_WEAPON_PROFICIENCY_DOUBLE_SCIMITAR   = 7948;
 const int FEAT_WEAPON_PROFICIENCY_GOAD              = 7949;
 const int FEAT_WEAPON_PROFICIENCY_EAGLE_CLAW        = 7950;
+const int FEAT_WEAPON_PROFICIENCY_LIGHT_XBOW		= 7951;
+const int FEAT_WEAPON_PROFICIENCY_HEAVY_XBOW		= 7952;
+const int FEAT_WEAPON_PROFICIENCY_QUARTERSTAFF		= 7953;
+const int FEAT_WEAPON_PROFICIENCY_DAGGER			= 7954;
+const int FEAT_WEAPON_PROFICIENCY_CLUB				= 7955;
+
 
 //:: New Weapon Focus Feats
 const int FEAT_WEAPON_FOCUS_LIGHT_LANCE			= 24601;
diff --git a/nwn/nwnprc/trunk/makefile.temp b/nwn/nwnprc/trunk/makefile.temp
index f2165183..e2596f56 100644
--- a/nwn/nwnprc/trunk/makefile.temp
+++ b/nwn/nwnprc/trunk/makefile.temp
@@ -8231,6 +8231,8 @@ gfx\ife_wepfoc_spf.tga \
 gfx\ife_wepprof_2sw.tga \
 gfx\ife_wepprof_bax.tga \
 gfx\ife_wepprof_bsw.tga \
+gfx\ife_wepprof_clu.tga \
+gfx\ife_wepprof_dag.tga \
 gfx\ife_wepprof_dar.tga \
 gfx\ife_wepprof_dax.tga \
 gfx\ife_wepprof_dma.tga \
@@ -8248,6 +8250,7 @@ gfx\ife_wepprof_hax.tga \
 gfx\ife_wepprof_hfl.tga \
 gfx\ife_wepprof_hmc.tga \
 gfx\ife_wepprof_hpk.tga \
+gfx\ife_wepprof_hxb.tga \
 gfx\ife_wepprof_kam.tga \
 gfx\ife_wepprof_kat.tga \
 gfx\ife_wepprof_ktr.tga \
@@ -8259,6 +8262,7 @@ gfx\ife_wepprof_lma.tga \
 gfx\ife_wepprof_lnc.tga \
 gfx\ife_wepprof_lpk.tga \
 gfx\ife_wepprof_lsw.tga \
+gfx\ife_wepprof_lxb.tga \
 gfx\ife_wepprof_mau.tga \
 gfx\ife_wepprof_mor.tga \
 gfx\ife_wepprof_nun.tga \
@@ -8273,6 +8277,7 @@ gfx\ife_wepprof_sic.tga \
 gfx\ife_wepprof_sli.tga \
 gfx\ife_wepprof_spe.tga \
 gfx\ife_wepprof_ssw.tga \
+gfx\ife_wepprof_sta.tga \
 gfx\ife_wepprof_tax.tga \
 gfx\ife_wepprof_tri.tga \
 gfx\ife_wepprof_wha.tga \
diff --git a/nwn/nwnprc/trunk/scripts/initdr_aurafeara.nss b/nwn/nwnprc/trunk/scripts/initdr_aurafeara.nss
index 4851722d..0dfcf145 100644
--- a/nwn/nwnprc/trunk/scripts/initdr_aurafeara.nss
+++ b/nwn/nwnprc/trunk/scripts/initdr_aurafeara.nss
@@ -23,8 +23,17 @@ void main()
     //Declare major variables
     object oTarget = GetEnteringObject();
 
-    if (MyPRCGetRacialType(oTarget)== RACIAL_TYPE_DRAGON || MyPRCGetRacialType(oTarget)== RACIAL_TYPE_DRAGON )
-      return;
+    // Exclude dead creatures
+    if (GetIsDead(oTarget))
+    {
+        return;
+    }
+
+    // Exclude dragons
+    if (MyPRCGetRacialType(oTarget) == RACIAL_TYPE_DRAGON)
+    {
+        return;
+    }
 
     effect eVis = EffectVisualEffect(VFX_IMP_FEAR_S);
     effect eDur = EffectVisualEffect(VFX_DUR_MIND_AFFECTING_FEAR);
@@ -33,10 +42,10 @@ void main()
 
     effect eFear = EffectFrightened();
     effect eAttackD = EffectAttackDecrease(2);
-    effect eDmgD = EffectDamageDecrease(2,DAMAGE_TYPE_BLUDGEONING|DAMAGE_TYPE_PIERCING|DAMAGE_TYPE_SLASHING);
-    effect SaveD = EffectSavingThrowDecrease(SAVING_THROW_ALL,2);
-    effect Skill = EffectSkillDecrease(SKILL_ALL_SKILLS,2);
-    
+    effect eDmgD = EffectDamageDecrease(2, DAMAGE_TYPE_BLUDGEONING | DAMAGE_TYPE_PIERCING | DAMAGE_TYPE_SLASHING);
+    effect SaveD = EffectSavingThrowDecrease(SAVING_THROW_ALL, 2);
+    effect Skill = EffectSkillDecrease(SKILL_ALL_SKILLS, 2);
+
     effect eLink = EffectLinkEffects(eDmgD, eDur2);
            eLink = EffectLinkEffects(eLink, eAttackD);
            eLink = EffectLinkEffects(eLink, SaveD);
@@ -45,24 +54,32 @@ void main()
            
     effect eLink2 = EffectLinkEffects(eDur3, SaveD);
            eLink2 = EffectLinkEffects(eLink2, Skill);
-           
-    int nHD = GetHitDice(GetAreaOfEffectCreator());
-    int nDC = 10 + GetLevelByClass(CLASS_TYPE_INITIATE_DRACONIC,GetAreaOfEffectCreator())+ GetAbilityModifier(ABILITY_CHARISMA,GetAreaOfEffectCreator());
-    int nDuration = d6(2);
-    if(GetIsEnemy(oTarget, GetAreaOfEffectCreator())&& GetHitDice(oTarget)<=GetHitDice(GetAreaOfEffectCreator()))
-    {
-        //Fire cast spell at event for the specified target
-        SignalEvent(oTarget, EventSpellCastAt(GetAreaOfEffectCreator(), SPELLABILITY_AURA_FEAR));
-        //Make a saving throw check
-        if(!PRCMySavingThrow(SAVING_THROW_WILL, oTarget, nDC, SAVING_THROW_TYPE_FEAR) && !GetIsImmune(oTarget, IMMUNITY_TYPE_FEAR) && !GetIsImmune(oTarget, IMMUNITY_TYPE_MIND_SPELLS))
-        {
-            int HD=GetHitDice(oTarget);
 
-            if (HD<5)
-            //Apply the VFX impact and effects
-              ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oTarget, RoundsToSeconds(nDuration));
+    int nHD = GetHitDice(GetAreaOfEffectCreator());
+    int nDC = 10 + GetLevelByClass(CLASS_TYPE_INITIATE_DRACONIC, GetAreaOfEffectCreator()) + GetAbilityModifier(ABILITY_CHARISMA, GetAreaOfEffectCreator());
+    int nDuration = d6(2);
+
+    if (GetIsEnemy(oTarget, GetAreaOfEffectCreator()) && GetHitDice(oTarget) <= GetHitDice(GetAreaOfEffectCreator()))
+    {
+        // Fire cast spell at event for the specified target
+        SignalEvent(oTarget, EventSpellCastAt(GetAreaOfEffectCreator(), SPELLABILITY_AURA_FEAR));
+
+        // Make a saving throw check
+        if (!PRCMySavingThrow(SAVING_THROW_WILL, oTarget, nDC, SAVING_THROW_TYPE_FEAR) 
+            && !GetIsImmune(oTarget, IMMUNITY_TYPE_FEAR) 
+            && !GetIsImmune(oTarget, IMMUNITY_TYPE_MIND_SPELLS))
+        {
+            int HD = GetHitDice(oTarget);
+
+            if (HD < 5)
+            {
+                // Apply the VFX impact and effects
+                ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oTarget, RoundsToSeconds(nDuration));
+            }
             else
-              ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink2, oTarget, RoundsToSeconds(nDuration));
+            {
+                ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink2, oTarget, RoundsToSeconds(nDuration));
+            }
 
             ApplyEffectToObject(DURATION_TYPE_INSTANT, eVis, oTarget);
         }
diff --git a/nwn/nwnprc/trunk/scripts/prc_ondeath.nss b/nwn/nwnprc/trunk/scripts/prc_ondeath.nss
index c492922e..41ae8d99 100644
--- a/nwn/nwnprc/trunk/scripts/prc_ondeath.nss
+++ b/nwn/nwnprc/trunk/scripts/prc_ondeath.nss
@@ -63,17 +63,20 @@ void main()
     // Clear a damage tracking variable. Oni's stuff uses this
     SetLocalInt(oDead, "PC_Damage", 0);
 
-    // Do Lolth's Meat for the killer
-    if(GetAbilityScore(oDead, ABILITY_INTELLIGENCE) >= 4 && GetHasFeat(FEAT_LOLTHS_MEAT, oKiller))
-    {
-        /*effect eLink = EffectSavingThrowIncrease(SAVING_THROW_ALL, 1, SAVING_THROW_TYPE_ALL);
-               eLink = EffectLinkEffects(eLink, EffectAttackIncrease(1, ATTACK_BONUS_MISC));
-               eLink = EffectLinkEffects(eLink, EffectDamageIncrease(DAMAGE_BONUS_1, DAMAGE_TYPE_DIVINE));
+// Do Lolth's Meat for the killer
+	if(GetAbilityScore(oDead, ABILITY_INTELLIGENCE) >= 4 
+	   && GetHasFeat(FEAT_LOLTHS_MEAT, oKiller) 
+	   && GetRacialType(oDead) != RACIAL_TYPE_UNDEAD 
+	   && GetRacialType(oDead) != RACIAL_TYPE_CONSTRUCT)
+	{
+		/*effect eLink = EffectSavingThrowIncrease(SAVING_THROW_ALL, 1, SAVING_THROW_TYPE_ALL);
+			   eLink = EffectLinkEffects(eLink, EffectAttackIncrease(1, ATTACK_BONUS_MISC));
+			   eLink = EffectLinkEffects(eLink, EffectDamageIncrease(DAMAGE_BONUS_1, DAMAGE_TYPE_DIVINE));
 
-        ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oKiller, RoundsToSeconds(5));
-        ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_IMP_EVIL_HELP), oKiller);*/
-        ExecuteScript("prc_lolthmeat", oKiller);
-    }
+		ApplyEffectToObject(DURATION_TYPE_TEMPORARY, eLink, oKiller, RoundsToSeconds(5));
+		ApplyEffectToObject(DURATION_TYPE_INSTANT, EffectVisualEffect(VFX_IMP_EVIL_HELP), oKiller);*/
+		ExecuteScript("prc_lolthmeat", oKiller);
+	}
 	
 	// Do Mind Cleave feat
 	if(GetHasFeat(FEAT_MIND_CLEAVE, oKiller))
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk
index ddd0b0d5..c8f32698 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk differ
diff --git a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
index 99a681bd..f214d3e5 100644
--- a/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
+++ b/nwn/nwnprc/trunk/tlk/prc8_consortium.tlk.xml
@@ -5098,6 +5098,11 @@ Feats Required: Exotic</entry>
   <entry id="16511" lang="en" sex="m">Overwhelming Critical (eagle claw)</entry>
   <entry id="16512" lang="en" sex="m">Devastating Critical (eagle claw)</entry>
   <entry id="16513" lang="en" sex="m">Weapon of Choice (eagle claw)</entry>
+  <entry id="16514" lang="en" sex="m">Weapon Proficiency: Light Crossbow</entry>
+  <entry id="16515" lang="en" sex="m">Weapon Proficiency: Heavy Crossbow</entry>
+  <entry id="16516" lang="en" sex="m">Weapon Proficiency: Quarterstaff</entry>
+  <entry id="16517" lang="en" sex="m">Weapon Proficiency: Dagger</entry>
+  <entry id="16518" lang="en" sex="m">Weapon Proficiency: Club</entry>
   <entry id="16520" lang="en" sex="m">Forest Master</entry>
   <entry id="16521" lang="en" sex="m">Forest Masters</entry>
   <entry id="16522" lang="en" sex="m">forest master</entry>
@@ -73176,4 +73181,4 @@ Use: Activated</entry>
   <entry id="77190" lang="en" sex="m">Spellcasting isn't required to take the Talon of Tiamat prestige class.  If you currently have an arcane spellcasting, shadowcasting or invoking class, do not pick this marker feat.</entry>
   <entry id="77191" lang="en" sex="m">Spellcasting isn't required to take the Dragonsong Lyrist prestige class.  If you currently have an arcane spellcasting or shadowcasting class, do not pick this marker feat.</entry>
   <entry id="77192" lang="en" sex="m">Spellcasting isn't required to take the Ollam prestige class.  If you currently have an arcane spellcasting or shadowcasting class, do not pick this marker feat.</entry>
-</tlk>
\ No newline at end of file
+</tlk>
diff --git a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk
index ddd0b0d5..c8f32698 100644
Binary files a/nwn/nwnprc/trunk/tlk/prc_consortium.tlk and b/nwn/nwnprc/trunk/tlk/prc_consortium.tlk differ