Ok for most part works

diff --git a/ElvUI_SLE/dev/commands.lua b/ElvUI_SLE/dev/commands.lua
index 41e4384..ca8d17c 100755
--- a/ElvUI_SLE/dev/commands.lua
+++ b/ElvUI_SLE/dev/commands.lua
@@ -41,18 +41,10 @@ end
 local function SendRecieve(self, event, prefix, message, channel, sender)
 	if event == "CHAT_MSG_ADDON" then
 		if sender == E.myname then return end
-		if SLE:CheckFlag(nil, 'SLEAUTHOR') then
-			--print("CheckFlag nil sleauthor is true")
-			return
-		end
+		if SLE:CheckFlag(nil, 'SLEAUTHOR') then return end
 		--if SLE:Auth() then return end
 		--if (prefix == 'SLE_DEV_SAYS' or prefix == 'SLE_DEV_CMD') and (SLE:CrossAuth(sender) or SLE:Auth()) then
-		if SLE:CheckFlag(sender, 'SLEAUTHOR') then
-			--print("This check is true and the sender is: "..sender)
-		else
-			--print("This check is false and the sender is: "..sender)
-		end
-		if (prefix == 'SLE_DEV_SAYS' or prefix == 'SLE_DEV_CMD') and not SLE:CheckFlag(sender, 'SLEAUTHOR') then
+		if (prefix == 'SLE_DEV_SAYS' or prefix == 'SLE_DEV_CMD') and SLE:CheckFlag(sender, 'SLEAUTHOR') then
 			if prefix == 'SLE_DEV_SAYS' then
 				local user, channel, msg, sendTo = split("#", message)

@@ -70,6 +62,9 @@ local function SendRecieve(self, event, prefix, message, channel, sender)
 				end
 			end
 		end
+		if prefix == 'SLE_DEV_REQ' and SLE:CheckFlag(sender, 'SLEAUTHOR') then
+			SendAddonMessage('SLE_DEV_INFO', UnitLevel('player')..'#'..E.myclass..'#'..E.myname..'#'..E.myrealm..'#'..SLE.version, channel)
+		end
 	end
 end
 RegisterAddonMessagePrefix('SLE_DEV_SAYS')
@@ -77,11 +72,6 @@ RegisterAddonMessagePrefix('SLE_DEV_CMD')

 if not SLE:CheckFlag(nil, 'SLEAUTHOR') then
 	RegisterAddonMessagePrefix('SLE_DEV_REQ')
-	SLE:RegisterEvent('CHAT_MSG_ADDON', function(event, prefix, message, channel, sender)
-		if prefix == 'SLE_DEV_REQ' and SLE:CheckFlag(sender, 'SLEAUTHOR') then
-			SendAddonMessage('SLE_DEV_INFO', UnitLevel('player')..'#'..E.myclass..'#'..E.myname..'#'..E.myrealm..'#'..SLE.version, channel)
-		end
-	end)
 end

 local f = CreateFrame('Frame', "DaFrame")
diff --git a/ElvUI_SLE/dev/options.lua b/ElvUI_SLE/dev/options.lua
index 63727f6..3d5bd9f 100644
--- a/ElvUI_SLE/dev/options.lua
+++ b/ElvUI_SLE/dev/options.lua
@@ -8,8 +8,11 @@ if SLE:CheckFlag(nil, 'SLEAUTHOR') then
 	local highestVersion = tonumber(SLE.version)

 	RegisterAddonMessagePrefix('SLE_DEV_INFO')
-	SLE:RegisterEvent('CHAT_MSG_ADDON', function(event, prefix, message, channel, sender) --
-		if prefix == 'SLE_DEV_INFO' then
+
+	local f = CreateFrame('Frame')
+	f:RegisterEvent('CHAT_MSG_ADDON')
+	f:SetScript('OnEvent', function(self, event, prefix, message, channel, sender)
+		if event == 'CHAT_MSG_ADDON' and prefix == 'SLE_DEV_INFO' then
 			local userLevel, userClass, userName, userRealm, userVersion = strsplit('#', message)
 			userVersion = tonumber(userVersion)

@@ -66,21 +69,24 @@ if SLE:CheckFlag(nil, 'SLEAUTHOR') then
 							end,
 							values = {
 								[''] = ' ',
-								['GUILD'] = 'GUILD',
-								['INSTANCE'] = 'INSTANCE',
-								['PARTY'] = 'PARTY',
-								['RAID'] = 'RAID',
-								['BATTLEGROUND'] = 'BATTLEGROUND',
+								['GUILD'] = 'Guild',
+								['INSTANCE_CHAT'] = 'Instance',
+								['PARTY'] = 'Party',
+								['RAID'] = 'Raid',
 							},
 						},
 						submitbutton = {
 							type = 'execute',
 							order = 3,
-							name = "Update List",
+							name = function()
+								return selectedChannel ~= '' and "Update List" or "Clear List"
+							end,
 							func = function(info, value)
 								UserListCache = {} -- Clear Cache
-
-								SendAddonMessage('SLE_DEV_REQ', 'GIVE ME YOUR INFO RIGHT NOW!!!!', selectedChannel)
+
+								if selectedChannel ~= '' then
+									SendAddonMessage('SLE_DEV_REQ', 'GIVE ME YOUR INFO RIGHT NOW!!!!', selectedChannel)
+								end
 							end,
 						},
 						Space = {