Index: /D_LutronRA2Telnet1.xml
===================================================================
--- /D_LutronRA2Telnet1.xml	(revision 1)
+++ /D_LutronRA2Telnet1.xml	(revision 3)
@@ -8,5 +8,5 @@
 		<deviceType>urn:schemas-micasaverde-com:device:LutronRA2Telnet:1</deviceType>
 		<staticJson>D_LutronRA2Telnet1.json</staticJson>
-		<friendlyName>Lutron RA2 Gateway via Ethernet </friendlyName>
+		<friendlyName>Lutron RadioRA2 Gateway</friendlyName>
 		<manufacturer>Lutron</manufacturer>
 		<manufacturerURL>http://www.lutron.com</manufacturerURL>
Index: /I_LutronRA2Telnet1.xml
===================================================================
--- /I_LutronRA2Telnet1.xml	(revision 1)
+++ /I_LutronRA2Telnet1.xml	(revision 3)
@@ -12,9 +12,6 @@
 
 			-- Callbacks
-			--ClearSysMessage = lutronPlugin.ClearSysMessage
 			getStatus = lutronPlugin.getStatus
 			handleResponse = lutronPlugin.handleResponse
-			--TeachIn = enoceanPlugin.TeachIn
-			--CheckTime = enoceanPlugin.CheckTime
 			return lutronPlugin.Init( lul_device )
 		end
@@ -44,49 +41,49 @@
 			<serviceId>urn:upnp-org:serviceId:SwitchPower1</serviceId>
 			<name>SetTarget</name>
-				<run>
+				<job>
 					lutronPlugin.setTarget(lul_device,lul_settings.newTargetValue)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:upnp-org:serviceId:Dimming1</serviceId>
 			<name>SetLoadLevelTarget</name>
-				<run>
+				<job>
 					lutronPlugin.setLoadLevelTarget(lul_device,lul_settings.newLoadlevelTarget)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:upnp-org:serviceId:WindowCovering1</serviceId>
 			<name>Up</name>
-				<run>
+				<job>
 					lutronPlugin.blindsUP(lul_device)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:upnp-org:serviceId:WindowCovering1</serviceId>
 			<name>Down</name>
-				<run>
+				<job>
 					lutronPlugin.blindsDown(lul_device)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:upnp-org:serviceId:WindowCovering1</serviceId>
 			<name>Stop</name>
-				<run>
+				<job>
 					lutronPlugin.blindsStop(lul_device)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:schemas-micasaverde-com:serviceId:LutronRA2Telnet1</serviceId>
 			<name>SendCommandButton</name>
-				<run>
+				<job>
 					lutronPlugin.sendCommandButton(lul_settings.CommandList)
-				</run>
+				</job>
 		</action>
 		<action>
 			<serviceId>urn:schemas-micasaverde-com:serviceId:LutronRA2Telnet1</serviceId>
 			<name>SendCommandKeypad</name>
-				<run>
+				<job>
 					lutronPlugin.sendCommandKeypad(lul_device, lul_settings.CommandKeypad)
-				</run>
+				</job>
 		</action>
 	</actionList>
Index: /L_LutronRA2Telnet1.lua
===================================================================
--- /L_LutronRA2Telnet1.lua	(revision 1)
+++ /L_LutronRA2Telnet1.lua	(revision 3)
@@ -13,5 +13,5 @@
 local ipAddress = ""
 local ipPort = ""
-local DEBUG_MODE = true
+local DEBUG_MODE = false
 
 local SID = {
@@ -110,10 +110,14 @@
 		if parameters[index] == "1" then
 			if devType == "SW_POWER" then
-				local val = tostring(tonumber(parameters[index + 1])) 
-				luup.variable_set(SID["SW_POWER"],"Status",val,id)
+				local val = tonumber(parameters[index + 1])
+				if val == 100  or val == 1 then
+					luup.variable_set(SID["SW_POWER"],"Status","1",id)
+				else 
+					luup.variable_set(SID["SW_POWER"],"Status","0",id)
+				end
 				debug("(Lutron RA2 Gateway PLugin)::(debug)::(setUI) : SW_POWER : UI has been set")
 			elseif devType == "DIMMER" or devType == "BLINDS" then
 				luup.variable_set(SID["DIMMER"],"LoadLevelStatus", parameters[index + 1], id)
-				debug("(Lutron RA2 Gateway PLugin)::(debug)::(setUI) : OK : UI has been set")
+				debug("(Lutron RA2 Gateway PLugin)::(debug)::(setUI) : DIMMER or BLINDS : UI has been set")
 			else
 				debug("(Lutron RA2 Gateway PLugin)::(debug)::(setUI) : Unknown command type! ")
@@ -123,5 +127,6 @@
 		index = index + 1
 		if parameters[index + 1] == "3" then
-			luup.variable_set(SID["LUTRON"],"KeypadCommand",parameters[index],id)	
+			luup.variable_set(SID["LUTRON"],"KeypadCommand",parameters[index],id)
+			debug("(Lutron RA2 Gateway PLugin)::(debug)::(setUI) : DEVICE : Unknown command type! ")
 		end
 	end
@@ -351,5 +356,5 @@
 		flagConnect = true
 	else
-		log("(Lutron RA2 Gateway PLugin)::(getInfo) : ERROR :  Insert IP address!")
+		log("(Lutron RA2 Gateway PLugin)::(getInfo) : ERROR : Insert IP address!")
 		flagError = false
 	end
@@ -376,4 +381,5 @@
 	local integrationId = ""
 	local cmd = ""
+  local fadeTime
 	for k,v in pairs(g_childDevices) do
 		if v.id == device then
@@ -473,5 +479,4 @@
 function Init (lul_device)
 	lug_device = lul_device
-	-- Update the Debug Mode.
 	local debugMode = luup.variable_get( SID["LUTRON"], "DebugMode", lug_device ) or ""
 	if debugMode == "" then
@@ -503,5 +508,5 @@
 		log(string.format ("(Lutron RA2 Gateway PLugin)::(Startup) : ipAddress=%s, ipPort=%s", tostring (ipAddress), tostring (ipPort)))
 		luup.io.open (lug_device, ipAddress, ipPort)
-		if luup.io.is_connected(device) == false then
+		if luup.io.is_connected(lug_device) == false then
 			log("(Lutron RA2 Gateway PLugin)::(Startup) : ERROR :  Could not connect to the device!")
 			return
@@ -521,2 +526,3 @@
 end
 
+
Index: /D_LutronKeypad1.json
===================================================================
--- /D_LutronKeypad1.json	(revision 1)
+++ /D_LutronKeypad1.json	(revision 3)
@@ -3,9 +3,4 @@
 	"inScene": "1",
 	"DisplayStatus": {},
-	"doc_url": {
-		"doc_forced_url": {
-			"text": "Lutron Keypad"
-		}
-	},
 	"Tabs": [
 		{
Index: /D_LutronRA2Telnet1.json
===================================================================
--- /D_LutronRA2Telnet1.json	(revision 1)
+++ /D_LutronRA2Telnet1.json	(revision 3)
@@ -5,5 +5,5 @@
 	"doc_url": {
 		"doc_forced_url": {
-			"text": "Lutron RA2 via Telnet"
+			"text": "http://code.mios.com/trac/mios_lutron_radiora2_gateway"
 		}
 	},
