Unleashed Fury and Elemental Blast fixes

diff --git a/Elementarist.lua b/Elementarist.lua
index 2346534..e8b8d56 100755
--- a/Elementarist.lua
+++ b/Elementarist.lua
@@ -746,13 +746,21 @@ function Elementarist:NextSpellElem(timeshift,exspell1,exspell2)
 	if (Elementarist.tier6Talent == 16) then
 		name, _, _, _, _, _, e, unitCaster = Elementarist:hasDeBuff("target", Elementarist.SpellList["Unleashed Fury"], "player");
 		if (name) and (e - GetTime() - timeshift) then
-			if (GetWeaponEnchantInfo()) and (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) then
-				return Elementarist.SpellList["Unleash Elements"];
+			if (GetWeaponEnchantInfo()) and (exspell1 ~= Elementarist.SpellList["Unleash Elements"]) and (exspell2 ~= Elementarist.SpellList["Unleash Elements"]) and (IsSpellInRange(Elementarist.SpellList["Unleash Elements"], "target") == 1) then
+				e = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Unleash Elements"])
+				if (e-timeshift <= 0) then
+					return Elementarist.SpellList["Unleash Elements"];
+				end
 			end
 		end
 	-- if Tier6 talent is Elemental Blast use it
 	elseif (Elementarist.tier6Talent == 18) then
-		if (exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and (exspell2 ~= Elementarist.SpellList["Elemental Blast"]) then
+		if (
+			(exspell1 ~= Elementarist.SpellList["Elemental Blast"]) and
+			(exspell2 ~= Elementarist.SpellList["Elemental Blast"]) and
+			(IsSpellInRange(Elementarist.SpellList["Elemental Blast"], "target") == 1) and
+			(Elementarist.SpellList["Elemental Blast"] ~= spellInCast)
+		) then
 			d = Elementarist:GetSpellCooldownRemaining(Elementarist.SpellList["Elemental Blast"])
 			if ((d - timeshift) <= 0) then
 				return Elementarist.SpellList["Elemental Blast"]