diff --git a/common/src/comp/inventory/item.rs b/common/src/comp/inventory/item.rs
index ed82aa1039..0af04fcd93 100644
--- a/common/src/comp/inventory/item.rs
+++ b/common/src/comp/inventory/item.rs
@@ -123,15 +123,15 @@ impl ToolData {
                 CastFireball {
                     projectile: Projectile {
                         hit_ground: vec![
-                            projectile::Effect::Explode { power: 5.0 },
+                            projectile::Effect::Explode { power: 1.5 },
                             projectile::Effect::Vanish,
                         ],
                         hit_wall: vec![
-                            projectile::Effect::Explode { power: 5.0 },
+                            projectile::Effect::Explode { power: 1.5 },
                             projectile::Effect::Vanish,
                         ],
                         hit_entity: vec![
-                            projectile::Effect::Explode { power: 5.0 },
+                            projectile::Effect::Explode { power: 1.5 },
                             projectile::Effect::Vanish,
                         ],
                         time_left: Duration::from_secs(20),
diff --git a/common/src/states/cast_fireball.rs b/common/src/states/cast_fireball.rs
index 9887803309..911562be72 100644
--- a/common/src/states/cast_fireball.rs
+++ b/common/src/states/cast_fireball.rs
@@ -1,5 +1,5 @@
 use crate::{
-    comp::{Body, CharacterState, Gravity, Projectile, StateUpdate},
+    comp::{Body, CharacterState, LightEmitter, Projectile, StateUpdate},
     event::ServerEvent,
     states::utils::*,
     sys::character_behavior::*,
@@ -46,9 +46,12 @@ impl CharacterBehavior for Data {
                 entity: data.entity,
                 dir: data.inputs.look_dir,
                 body: self.projectile_body,
-                light: None,
+                light: Some(LightEmitter {
+                    col: (0.0, 1.0, 0.3).into(),
+                    ..Default::default()
+                }),
                 projectile,
-                gravity: Some(Gravity(0.1)),
+                gravity: None,
             });
 
             update.character = CharacterState::CastFireball(Data {
diff --git a/common/src/states/utils.rs b/common/src/states/utils.rs
index c2f35c222a..a1747d017a 100644
--- a/common/src/states/utils.rs
+++ b/common/src/states/utils.rs
@@ -5,7 +5,6 @@ use crate::{
     sys::{character_behavior::JoinData, phys::GRAVITY},
     util::safe_slerp,
 };
-use std::time::Duration;
 use vek::vec::Vec2;
 
 pub const MOVEMENT_THRESHOLD_VEL: f32 = 3.0;
diff --git a/common/src/sys/combat.rs b/common/src/sys/combat.rs
index d8a9f2f467..9ddb10e45f 100644
--- a/common/src/sys/combat.rs
+++ b/common/src/sys/combat.rs
@@ -10,8 +10,6 @@ use specs::{Entities, Join, Read, ReadStorage, System, WriteStorage};
 use vek::*;
 
 const BLOCK_EFFICIENCY: f32 = 0.9;
-
-const ATTACK_RANGE: f32 = 3.5;
 const BLOCK_ANGLE: f32 = 180.0;
 
 /// This system is responsible for handling accepted inputs like moving or