diff --git a/assets/common/abilities/axe/doublestrike.ron b/assets/common/abilities/axe/doublestrike.ron
index f1668fe86c..09f55a7eb4 100644
--- a/assets/common/abilities/axe/doublestrike.ron
+++ b/assets/common/abilities/axe/doublestrike.ron
@@ -9,9 +9,9 @@ ComboMelee(
             knockback: 8.0,
             range: 3.5,
             angle: 50.0,
-            base_buildup_duration: 0.3,
+            base_buildup_duration: 0.2,
             base_swing_duration: 0.075,
-            base_recover_duration: 0.3,
+            base_recover_duration: 0.15,
             forward_movement: 0.5,
         ),
         (
@@ -23,7 +23,7 @@ ComboMelee(
             knockback: 12.0,
             range: 3.5,
             angle: 30.0,
-            base_buildup_duration: 0.4,
+            base_buildup_duration: 0.25,
             base_swing_duration: 0.1,
             base_recover_duration: 0.4,
             forward_movement: 0.25,
diff --git a/assets/common/abilities/hammer/singlestrike.ron b/assets/common/abilities/hammer/singlestrike.ron
index 3d6d64cda5..6462b08599 100644
--- a/assets/common/abilities/hammer/singlestrike.ron
+++ b/assets/common/abilities/hammer/singlestrike.ron
@@ -1,14 +1,14 @@
 ComboMelee(
     stage_data: [(
         stage: 1,
-        base_damage: 130,
+        base_damage: 150,
         damage_increase: 10,
         base_poise_damage: 0,
         poise_damage_increase: 0,
         knockback: 10.0,
         range: 4.5,
         angle: 50.0,
-        base_buildup_duration: 0.4,
+        base_buildup_duration: 0.3,
         base_swing_duration: 0.1,
         base_recover_duration: 0.2,
         forward_movement: 0.0,
diff --git a/assets/common/abilities/staffsimple/flamethrower.ron b/assets/common/abilities/staffsimple/flamethrower.ron
new file mode 100644
index 0000000000..99ac486041
--- /dev/null
+++ b/assets/common/abilities/staffsimple/flamethrower.ron
@@ -0,0 +1,14 @@
+BasicBeam(
+    buildup_duration: 0.25,
+    recover_duration: 0.25,
+    beam_duration: 1.0,
+    base_hps: 0,
+    base_dps: 150,
+    tick_rate: 3.0,
+    range: 20.0,
+    max_angle: 0.1,
+    lifesteal_eff: 0.0,
+    energy_regen: 0,
+    energy_cost: 1,
+    energy_drain: 350,
+)
diff --git a/assets/common/abilities/sword/triplestrike.ron b/assets/common/abilities/sword/triplestrike.ron
index 4482f80182..ba9a689c71 100644
--- a/assets/common/abilities/sword/triplestrike.ron
+++ b/assets/common/abilities/sword/triplestrike.ron
@@ -11,7 +11,7 @@ ComboMelee(
             angle: 30.0,
             base_buildup_duration: 0.2,
             base_swing_duration: 0.075,
-            base_recover_duration: 0.2,
+            base_recover_duration: 0.1,
             forward_movement: 0.5,
         ),
         (
@@ -23,7 +23,7 @@ ComboMelee(
             knockback: 12.0,
             range: 3.5,
             angle: 40.0,
-            base_buildup_duration: 0.15,
+            base_buildup_duration: 0.1,
             base_swing_duration: 0.1,
             base_recover_duration: 0.3,
             forward_movement: 0.0,
diff --git a/assets/common/abilities/weapon_ability_manifest.ron b/assets/common/abilities/weapon_ability_manifest.ron
index 2da91688d4..db9f089447 100644
--- a/assets/common/abilities/weapon_ability_manifest.ron
+++ b/assets/common/abilities/weapon_ability_manifest.ron
@@ -49,7 +49,7 @@
     ),
     StaffSimple: (
         primary: "common.abilities.staffsimple.firebomb",
-        secondary: "common.abilities.staffsimple.firebomb",
+        secondary: "common.abilities.staffsimple.flamethrower",
         abilities: [],
     ),
     BowSimple: (
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
index 26ad008754..f1c8cae036 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/chest/haniwa.ron
@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Chest("Haniwa"),
         stats: (
-            protection: Normal(28.0),
+            protection: Normal(23.0),
             poise_resilience: Normal(1.0),
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
index fe1f7aa7a5..9184b2f94a 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/foot/haniwa.ron
@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Foot("Haniwa"),
         stats: (
-            protection: Normal(20.0),
+            protection: Normal(17.0),
             poise_resilience: Normal(1.0),
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
index 8d201e984f..f4a9dba2fd 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/hand/haniwa.ron
@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Hand("Haniwa"),
         stats: (
-            protection: Normal(20.0),
+            protection: Normal(17.0),
             poise_resilience: Normal(1.0),
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
index f5fb003079..482d9566b2 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/head/haniwa.ron
@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Head("Haniwa"),
         stats: (
-            protection: Normal(20.0),
+            protection: Normal(17.0),
             poise_resilience: Normal(1.0),
         ),
     )),
diff --git a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
index 8fc066005e..0cd5e96f71 100644
--- a/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
+++ b/assets/common/items/npc_armor/biped_small/haniwa/pants/haniwa.ron
@@ -4,7 +4,7 @@ ItemDef(
     kind: Armor((
         kind: Pants("Haniwa"),
         stats: (
-            protection: Normal(20.0),
+            protection: Normal(17.0),
             poise_resilience: Normal(1.0),
         ),
     )),
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
index a57eea2f77..e0e5f9ee14 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/adlet_bow.ron
@@ -9,7 +9,7 @@ ItemDef(
                 equip_time_millis: 0,
                 power: 0.7,
                 poise_strength: 0.8,
-                speed: 0.5
+                speed: 0.3
             ),            
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
index 508bc02a5f..44661cb2f6 100644
--- a/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/adlet/gnoll_staff.ron
@@ -3,13 +3,13 @@ ItemDef(
     description: "eekum bokum",
     kind: Tool(
         (
-            kind: Staff,   
+            kind: StaffSimple,   
             hands: Two, 
             stats: (
                 equip_time_millis: 0,
                 power: 0.7,
                 poise_strength: 0.8,
-                speed: 1.0
+                speed: 0.5
             ),
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
index 4bb10ee6d3..03bc224c53 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/adlet_bow.ron
@@ -9,7 +9,7 @@ ItemDef(
                 equip_time_millis: 0,
                 power: 0.3,
                 poise_strength: 0.8,
-                speed: 0.5
+                speed: 0.7
             ),            
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
index eecaa95204..6c8dbbecf7 100644
--- a/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/gnarling/gnoll_staff.ron
@@ -3,13 +3,13 @@ ItemDef(
     description: "eekum bokum",
     kind: Tool(
         (
-            kind: Staff,   
+            kind: StaffSimple,   
             hands: Two, 
             stats: (
                 equip_time_millis: 0,
                 power: 0.3,
                 poise_strength: 0.8,
-                speed: 1.0
+                speed: 0.8
             ),
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
index c03cb13276..6bb840c1f6 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/adlet_bow.ron
@@ -7,9 +7,9 @@ ItemDef(
             hands: Two, 
             stats: (
                 equip_time_millis: 0,
-                power: 1.4,
+                power: 1.6,
                 poise_strength: 0.8,
-                speed: 0.5
+                speed: 0.3
             ),            
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
index 1bd2aaace0..c1682cff49 100644
--- a/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/haniwa/gnoll_staff.ron
@@ -3,13 +3,13 @@ ItemDef(
     description: "eekum bokum",
     kind: Tool(
         (
-            kind: Staff,   
+            kind: StaffSimple,   
             hands: Two, 
             stats: (
                 equip_time_millis: 0,
-                power: 1.4,
+                power: 1.8,
                 poise_strength: 0.8,
-                speed: 1.0
+                speed: 0.6
             ),
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
index cf7cc36be2..c0f890b546 100644
--- a/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/myrmidon/gnoll_staff.ron
@@ -3,13 +3,13 @@ ItemDef(
     description: "eekum bokum",
     kind: Tool(
         (
-            kind: Staff,    
+            kind: StaffSimple,    
             hands: Two,
             stats: (
                 equip_time_millis: 0,
                 power: 1.7,
                 poise_strength: 0.8,
-                speed: 1.0
+                speed: 0.7
             ),
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
index 1064b2360d..7312c4e987 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/adlet_bow.ron
@@ -7,9 +7,9 @@ ItemDef(
             hands: Two,
             stats: (
                 equip_time_millis: 0,
-                power: 0.3,
+                power: 1.1,
                 poise_strength: 0.8,
-                speed: 0.5
+                speed: 0.3
             ),            
         )
     ),
diff --git a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
index 8b4dd83c70..412f505250 100644
--- a/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
+++ b/assets/common/items/npc_weapons/biped_small/sahagin/gnoll_staff.ron
@@ -3,13 +3,13 @@ ItemDef(
     description: "eekum bokum",
     kind: Tool(
         (
-            kind: Staff,  
+            kind: StaffSimple,  
             hands: Two,  
             stats: (
                 equip_time_millis: 0,
                 power: 1.1,
                 poise_strength: 0.8,
-                speed: 1.0
+                speed: 0.8
             ),
         )
     ),
diff --git a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
index 4966529aeb..ce90851af9 100644
--- a/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
+++ b/assets/common/items/npc_weapons/hammer/yeti_hammer.ron
@@ -6,8 +6,8 @@ ItemDef(
             kind: HammerSimple,              
             hands: Two,
             stats: (
-                equip_time_millis: 500,
-                power: 1.00,
+                equip_time_millis: 0,
+                power: 2.0,
                 poise_strength: 1.00,
                 speed: 1.0
             ),
diff --git a/assets/common/items/npc_weapons/unique/quadlowbeam.ron b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
index cd8b3bfcc3..c46bb03d52 100644
--- a/assets/common/items/npc_weapons/unique/quadlowbeam.ron
+++ b/assets/common/items/npc_weapons/unique/quadlowbeam.ron
@@ -4,6 +4,7 @@ ItemDef(
     kind: Tool(
         (
             kind: Unique(QuadLowBeam),
+            hands: Two,
             stats: (
                 equip_time_millis: 10,
                 power: 1.00,
@@ -13,4 +14,5 @@ ItemDef(
         )
     ),
     quality: Low,
+    tags: [],
 )
diff --git a/common/src/comp/body.rs b/common/src/comp/body.rs
index 368632c34c..84351dc58d 100644
--- a/common/src/comp/body.rs
+++ b/common/src/comp/body.rs
@@ -374,8 +374,8 @@ impl Body {
                 biped_small::Species::Gnarling => 300,
                 biped_small::Species::Adlet => 400,
                 biped_small::Species::Sahagin => 500,
-                biped_small::Species::Haniwa => 900,
-                biped_small::Species::Myrmidon => 1000,
+                biped_small::Species::Haniwa => 700,
+                biped_small::Species::Myrmidon => 800,
             _ => 600,
             },   
             Body::Object(object) => match object {
diff --git a/common/src/event.rs b/common/src/event.rs
index c38855cd21..0a73cfa947 100644
--- a/common/src/event.rs
+++ b/common/src/event.rs
@@ -9,7 +9,7 @@ use crate::{
 };
 use comp::{
     invite::{InviteKind, InviteResponse},
-    item::{Item, Reagent},
+    item::Item,
     Ori, Pos,
 };
 use specs::Entity as EcsEntity;
diff --git a/server/src/events/entity_manipulation.rs b/server/src/events/entity_manipulation.rs
index ff03ff7206..c3aa3a8298 100644
--- a/server/src/events/entity_manipulation.rs
+++ b/server/src/events/entity_manipulation.rs
@@ -447,6 +447,7 @@ pub fn handle_destroy(server: &mut Server, entity: EcsEntity, cause: HealthSourc
             let _ = state
                 .create_object(comp::Pos(pos.0 + Vec3::unit_z() * 0.25), match old_body {
                     Some(common::comp::Body::Humanoid(_)) => object::Body::Pouch,
+                    Some(common::comp::Body::BipedSmall(_)) => object::Body::Pouch,
                     Some(common::comp::Body::Golem(_)) => object::Body::Chest,
                     Some(common::comp::Body::BipedLarge(_))
                     | Some(common::comp::Body::QuadrupedLow(_)) => object::Body::MeatDrop,
diff --git a/server/src/sys/agent.rs b/server/src/sys/agent.rs
index 49e1a7151e..f9e6d3e433 100644
--- a/server/src/sys/agent.rs
+++ b/server/src/sys/agent.rs
@@ -497,8 +497,11 @@ impl<'a> System<'a> for Sys {
                             }) {
                                 Some(ToolKind::Bow) => Tactic::Bow,
                                 Some(ToolKind::Staff) => Tactic::Staff,
+                                Some(ToolKind::StaffSimple) => Tactic::Staff,
                                 Some(ToolKind::Hammer) => Tactic::Hammer,
                                 Some(ToolKind::Sword) => Tactic::Sword,
+                                Some(ToolKind::Spear) => Tactic::Sword,
+                                Some(ToolKind::SwordSimple) => Tactic::Sword,
                                 Some(ToolKind::Axe) => Tactic::Axe,
                                 Some(ToolKind::Unique(UniqueKind::StoneGolemFist)) => {
                                     Tactic::StoneGolemBoss
diff --git a/voxygen/anim/src/biped_small/alpha.rs b/voxygen/anim/src/biped_small/alpha.rs
index 3d183e3bbc..317a85ac7a 100644
--- a/voxygen/anim/src/biped_small/alpha.rs
+++ b/voxygen/anim/src/biped_small/alpha.rs
@@ -52,7 +52,7 @@ impl Animation for AlphaAnimation {
 
         let speednorm = speed / 9.4;
         let speednormcancel = 1.0 - speednorm;
-
+        let anim_time = anim_time.min(1.0);
         let (move1base, move2base, move3) = match stage_section {
             Some(StageSection::Buildup) => ((anim_time as f32).sqrt(), 0.0, 0.0),
             Some(StageSection::Swing) => (1.0, (anim_time as f32).powi(4), 0.0),
diff --git a/voxygen/anim/src/biped_small/shoot.rs b/voxygen/anim/src/biped_small/shoot.rs
index cae4e56b07..20a96336d8 100644
--- a/voxygen/anim/src/biped_small/shoot.rs
+++ b/voxygen/anim/src/biped_small/shoot.rs
@@ -111,7 +111,7 @@ impl Animation for ShootAnimation {
                 next.control.orientation = Quaternion::rotation_x(-0.3 + move1abs * 0.4)
                     * Quaternion::rotation_y(0.5 * speednorm);
             },
-            Some(ToolKind::Staff) => {
+            Some(ToolKind::Staff) | Some(ToolKind::StaffSimple) => {
                 let (move1base, _move2base, move3) = match stage_section {
                     Some(StageSection::Buildup) => ((anim_time as f32).powf(0.25), 0.0, 0.0),
                     Some(StageSection::Swing) => (1.0, (anim_time as f32).powf(0.25), 0.0),
diff --git a/voxygen/anim/src/character/mod.rs b/voxygen/anim/src/character/mod.rs
index 36e2cae0c4..135d142d46 100644
--- a/voxygen/anim/src/character/mod.rs
+++ b/voxygen/anim/src/character/mod.rs
@@ -117,7 +117,7 @@ impl Skeleton for CharacterSkeleton {
             make_bone(control_mat * hand_l_mat * Mat4::<f32>::from(self.hold)),
         ];
         // NOTE: lantern_mat.cols.w = lantern_mat * Vec4::unit_w()
-        (head_mat * lantern_mat.cols.w).xyz()
+        (lantern_mat.cols.w / 13.0).xyz()
     }
 }
 
diff --git a/voxygen/src/scene/figure/load.rs b/voxygen/src/scene/figure/load.rs
index b0c02234f7..d4cf724d16 100644
--- a/voxygen/src/scene/figure/load.rs
+++ b/voxygen/src/scene/figure/load.rs
@@ -2495,7 +2495,7 @@ make_vox_spec!(
         armor_tail: BipedSmallArmorTailSpec = "voxygen.voxel.biped_small_armor_tail_manifest",
 
     },
-    |FigureKey { body, extra }, spec| {
+    |FigureKey { body: _, extra }, spec| {
         const DEFAULT_LOADOUT: super::cache::CharacterCacheKey = super::cache::CharacterCacheKey {
             third_person: None,
             tool: None,
diff --git a/world/src/site/dungeon/mod.rs b/world/src/site/dungeon/mod.rs
index ad2cbe9964..bccec64ed9 100644
--- a/world/src/site/dungeon/mod.rs
+++ b/world/src/site/dungeon/mod.rs
@@ -883,7 +883,6 @@ impl Floor {
                                         .with_skillset_config(
                                             common::skillset_builder::SkillSetConfig::Outcast,
                                         )
-                                        .with_scale(2.0)
                                         .with_main_tool(comp::Item::new_from_asset_expect(
                                             match dynamic_rng.gen_range(0..6) {
                                                 0 => "common.items.weapons.axe.worn_iron_axe-0",
@@ -927,7 +926,6 @@ impl Floor {
                                         .with_skillset_config(
                                             common::skillset_builder::SkillSetConfig::Bandit
                                         )
-                                        .with_scale(2.0)
                                         .with_main_tool(comp::Item::new_from_asset_expect(
                                             match dynamic_rng.gen_range(0..6) {
                                                 0 => "common.items.weapons.axe.steel_axe-0",
@@ -1138,7 +1136,6 @@ impl Floor {
                                         .with_skillset_config(
                                             common::skillset_builder::SkillSetConfig::CultistAcolyte
                                         )
-                                        .with_scale(2.0)
                                         .with_main_tool(comp::Item::new_from_asset_expect(
                                             match dynamic_rng.gen_range(0..6) {
                                                 0 => "common.items.weapons.axe.malachite_axe-0",