diff --git a/assets/common/abilities/staff/flamethrower.ron b/assets/common/abilities/staff/flamethrower.ron
index 4e0194fbe3..c3c491b94a 100644
--- a/assets/common/abilities/staff/flamethrower.ron
+++ b/assets/common/abilities/staff/flamethrower.ron
@@ -2,7 +2,7 @@ BasicBeam(
     buildup_duration: 0.25,
     recover_duration: 0.25,
     beam_duration: 1.0,
-    damage: 50,
+    damage: 35,
     tick_rate: 3.0,
     range: 20.0,
     max_angle: 15.0,
diff --git a/assets/common/abilities/swordsimple/dash.ron b/assets/common/abilities/swordsimple/dash.ron
index d9ddf8bb0a..f22e4723d2 100644
--- a/assets/common/abilities/swordsimple/dash.ron
+++ b/assets/common/abilities/swordsimple/dash.ron
@@ -10,10 +10,10 @@ DashMelee(
     angle: 45.0,
     energy_drain: 0,
     forward_speed: 4.0,
-    buildup_duration: 0.25,
+    buildup_duration: 0.6,
     charge_duration: 1.2,
     swing_duration: 0.1,
-    recover_duration: 0.5,
+    recover_duration: 0.9,
     charge_through: true,
     is_interruptible: true,
 )
diff --git a/assets/common/abilities/swordsimple/doublestrike.ron b/assets/common/abilities/swordsimple/doublestrike.ron
index bc5178debc..bb55bd6505 100644
--- a/assets/common/abilities/swordsimple/doublestrike.ron
+++ b/assets/common/abilities/swordsimple/doublestrike.ron
@@ -10,7 +10,7 @@ ComboMelee(
             range: 3.5,
             angle: 50.0,
             base_buildup_duration: 0.4,
-            base_swing_duration: 0.06,
+            base_swing_duration: 0.08,
             base_recover_duration: 0.5,
             forward_movement: 2.5,
         ),
@@ -23,9 +23,9 @@ ComboMelee(
             knockback: 12.0,
             range: 3.5,
             angle: 30.0,
-            base_buildup_duration: 0.5,
+            base_buildup_duration: 0.7,
             base_swing_duration: 0.1,
-            base_recover_duration: 0.5,
+            base_recover_duration: 0.7,
             forward_movement: 2.0,
         ),
     ],
diff --git a/common/src/states/basic_beam.rs b/common/src/states/basic_beam.rs
index e69dad4f79..aaf9dabea6 100644
--- a/common/src/states/basic_beam.rs
+++ b/common/src/states/basic_beam.rs
@@ -68,7 +68,7 @@ impl CharacterBehavior for Data {
             },
         }
 
-        handle_orientation(data, &mut update, 0.3);
+        handle_orientation(data, &mut update, 0.6);
         handle_move(data, &mut update, 0.4);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/blink.rs b/common/src/states/blink.rs
index 884b612555..5678a46eff 100644
--- a/common/src/states/blink.rs
+++ b/common/src/states/blink.rs
@@ -37,6 +37,8 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 1.0);
+
         match self.stage_section {
             StageSection::Buildup => {
                 if self.timer < self.static_data.buildup_duration {
diff --git a/common/src/states/healing_beam.rs b/common/src/states/healing_beam.rs
index 23caaded52..0107412185 100644
--- a/common/src/states/healing_beam.rs
+++ b/common/src/states/healing_beam.rs
@@ -52,6 +52,7 @@ impl CharacterBehavior for Data {
     fn behavior(&self, data: &JoinData) -> StateUpdate {
         let mut update = StateUpdate::from(data);
 
+        handle_orientation(data, &mut update, 0.6);
         handle_move(data, &mut update, 0.4);
         handle_jump(data, &mut update, 1.0);
 
diff --git a/common/src/states/roll.rs b/common/src/states/roll.rs
index abbffba3bd..71e62c54bc 100644
--- a/common/src/states/roll.rs
+++ b/common/src/states/roll.rs
@@ -47,7 +47,7 @@ impl CharacterBehavior for Data {
         let mut update = StateUpdate::from(data);
 
         // Smooth orientation
-        handle_orientation(data, &mut update, 1.0);
+        handle_orientation(data, &mut update, 1.3);
 
         match self.stage_section {
             StageSection::Buildup => {
diff --git a/voxygen/anim/src/character/swim.rs b/voxygen/anim/src/character/swim.rs
index f0af9cee52..6556313598 100644
--- a/voxygen/anim/src/character/swim.rs
+++ b/voxygen/anim/src/character/swim.rs
@@ -233,8 +233,8 @@ impl Animation for SwimAnimation {
         next.torso.orientation = Quaternion::rotation_x(
             (((1.0 / switch) * PI / 2.0 + avg_vel.z * 0.12).min(1.57) - PI / 2.0)
                 + avgspeed * avg_vel.z * -0.003,
-        ) * Quaternion::rotation_y(tilt * 8.0)
-            * Quaternion::rotation_z(tilt * 8.0);
+        ) * Quaternion::rotation_y(tilt * 2.0)
+            * Quaternion::rotation_z(tilt * 3.0);
         next.torso.scale = Vec3::one() / 11.0 * s_a.scaler;
         match hands {
             (Some(Hands::One), _) => match active_tool_kind {