diff --git a/db/Changelog.txt b/db/Changelog.txt
index 2370506b04..18d510f689 100644
--- a/db/Changelog.txt
+++ b/db/Changelog.txt
@@ -19,6 +19,9 @@
 	-----
 
 =========================
+08/19
+	* Updated Kouenka, removed aftercast delay [Toms]
+	* Fixed some Ninja weapons (1Hand Sword -> Dagger) [Toms]
 08/18
 	* Made HLIF_HEAL a self skill that auto-selects target to caster's master.
 	  [Skotlex]
diff --git a/db/item_db.txt b/db/item_db.txt
index 77316db29d..e0d5a7e8c7 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2635,10 +2635,10 @@
 13009,Kamaitachi,Kamaitachi,4,48000,,900,125,,1,0,0x02000000,7,2,2,4,70,1,1,{ bonus bAtkEle,Ele_Dark; bonus bCritical,3; bonus bAspdRate,3; },{},{}
 13010,Ashura,Ashura,4,32000,,600,50,,1,2,0x02000000,7,2,2,1,12,1,1,{ bonus bMatkRate,10; },{},{}
 13011,Ashura_,Ashura,4,32000,,600,50,,1,3,0x02000000,7,2,2,1,12,1,1,{ bonus bMatkRate,10; },{},{}
-13012,Murasame,Murasame,4,48000,,700,95,,1,1,0x02000000,7,2,2,2,24,1,2,{ bonus bAtkEle,Ele_Water; bonus2 bCriticalAddRace,RC_DemiHuman,10; },{},{}
-13013,Murasame_,Murasame,4,48000,,700,95,,1,2,0x02000000,7,2,2,2,24,1,2,{ bonus bAtkEle,Ele_Water; bonus2 bCriticalAddRace,RC_DemiHuman,10; },{},{}
-13014,Hakujin,Hakujin,4,120000,,800,120,,1,0,0x02000000,7,2,2,3,42,1,2,{ bonus4 bAutoSpell,28,1,20,0; },{},{}
-13015,Hakujin_,Hakujin,4,120000,,800,120,,1,1,0x02000000,7,2,2,3,42,1,2,{ bonus4 bAutoSpell,28,1,20,0; },{},{}
+13012,Murasame,Murasame,4,48000,,700,95,,1,1,0x02000000,7,2,2,2,24,1,1,{ bonus bAtkEle,Ele_Water; bonus2 bCriticalAddRace,RC_DemiHuman,10; },{},{}
+13013,Murasame_,Murasame,4,48000,,700,95,,1,2,0x02000000,7,2,2,2,24,1,1,{ bonus bAtkEle,Ele_Water; bonus2 bCriticalAddRace,RC_DemiHuman,10; },{},{}
+13014,Hakujin,Hakujin,4,120000,,800,120,,1,0,0x02000000,7,2,2,3,42,1,1,{ bonus4 bAutoSpell,28,1,20,0; },{},{}
+13015,Hakujin_,Hakujin,4,120000,,800,120,,1,1,0x02000000,7,2,2,3,42,1,1,{ bonus4 bAutoSpell,28,1,20,0; },{},{}
 13016,Poison_Knife__,Poison Knife,4,,10,800,64,,1,2,0x028F5EEE,7,2,2,3,65,1,1,{ bonus bAtkEle,Ele_Poison; bonus2 bAddEff,Eff_Poison,3000; },{},{}
 13017,Ice_Pick_,Ice Pick,4,,10,600,70,,1,1,0x028F5EEE,7,2,2,4,36,1,1,{ bonus bDefRatioAtkRace,RC_Boss; bonus bDefRatioAtkRace,RC_NonBoss; },{},{}
 13018,Sucsamad_,Sucsamad,4,,10,800,140,,1,1,0x028F5EEE,7,2,2,4,36,1,1,{ bonus2 bAddEle,Ele_Earth,10; bonus2 bAddEle,Ele_Wind,10; bonus bUnbreakableWeapon,0; },{},{}
diff --git a/db/skill_cast_db.txt b/db/skill_cast_db.txt
index 3f56a41be2..45600c6e88 100644
--- a/db/skill_cast_db.txt
+++ b/db/skill_cast_db.txt
@@ -900,7 +900,7 @@
 532,4000:3500:3000:2500:2000:3000:2500:2000:1500:1000,0,0,60000:80000:100000:120000:140000:160000:180000:200000:220000:240000,0
 
 //-- NJ_KOUENKA
-534,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0:200:400:600:800:1000:1200:1400:1600:1800,0,0,0
+534,700:1400:2100:2800:3500:4200:4900:5600:6300:7000,0,0,0,0
 //-- NJ_KAENSIN
 535,6000:5500:5000:4500:4000:3500:3000:2500:2000:1500,1000,0,20000,0,
 //-- NJ_BAKUENRYU