diff --git a/api.lua b/api.lua
index 56e5850..0cd3bf9 100644
--- a/api.lua
+++ b/api.lua
@@ -2670,6 +2670,7 @@ end
 --end of NSSM additions
 
 -- explosion (cannot break protected or unbreakable nodes)
+--[[
 function nssm:explosion(pos, radius, fire, smoke, sound)
 
 	radius = radius or 0
@@ -2767,7 +2768,7 @@ function nssm:explosion(pos, radius, fire, smoke, sound)
 					end
 
 				--NSSM modification is it really useful?
-				--[[
+
 				else if (x<3)and(y<3)and(z<3)and(x>-3)and(y>-3)and(z>-3) then
 						if (math.random(1,100))>25 then
 							minetest.remove_node(p)
@@ -2778,7 +2779,7 @@ function nssm:explosion(pos, radius, fire, smoke, sound)
 					end
 				end
 					end
-				]]--
+				--end of NSSM modification
 				end
 			end
 		end
@@ -2789,6 +2790,7 @@ function nssm:explosion(pos, radius, fire, smoke, sound)
 	end
 	end
 end
+]]
 
 -- register arrow for shoot attack
 function nssm:register_arrow(name, def)
diff --git a/init.lua b/init.lua
index 3c16698..57f4851 100644
--- a/init.lua
+++ b/init.lua
@@ -53,5 +53,7 @@ dofile(path.."/rainbow_staff.lua")
 dofile(path.."/darts.lua")
 dofile(path.."/nssm_materials.lua")
 dofile(path.."/kienzan.lua")
-dofile(path.."/kamehameha.lua")
+--dofile(path.."/kamehameha.lua")
 dofile(path.."/nssm_spears.lua")
+dofile(path.."/nssm_api.lua")
+dofile(path.."/nssm_weapons.lua")
diff --git a/kamehameha.lua b/kamehameha.lua
index 89d06d1..dd596eb 100644
--- a/kamehameha.lua
+++ b/kamehameha.lua
@@ -2,11 +2,6 @@
 kame_velocity = 30
 exp_radius = 4
 
-local function round(n)
-    return n % 1 >= 0.5 and math.ceil(n) or math.floor(n)
-end
-
-
 minetest.register_entity("nssm:kamehameha", {
 	textures = {"kamehameha.png"},
 	on_step = function (self, pos, node, dtime)
@@ -38,9 +33,9 @@ minetest.register_entity("nssm:kamehameha", {
 				local c=3
 
 				--calculate how many blocks around the kamehameha need to be removed
-				local i = round(math.abs(math.abs(vec.x)-kame_velocity)*0.01*c)
-				local j = round(math.abs(math.abs(vec.y)-kame_velocity)*0.01*c)
-				local k = round(math.abs(math.abs(vec.z)-kame_velocity)*0.01*c)
+				local i = nssm:round(math.abs(math.abs(vec.x)-kame_velocity)*0.01*c)
+				local j = nssm:round(math.abs(math.abs(vec.y)-kame_velocity)*0.01*c)
+				local k = nssm:round(math.abs(math.abs(vec.z)-kame_velocity)*0.01*c)
 
 				for dx = -i,i do
 					for dy= -j,j do
@@ -163,7 +158,6 @@ minetest.register_tool("nssm:kamehameha_hand", {
 			obj:setvelocity(vec)
 		return itemstack
 	end,
-	light_source = 12,
 })
 
 minetest.register_craft({