diff --git a/MrSlim.indigoPlugin/Contents/Info.plist b/MrSlim.indigoPlugin/Contents/Info.plist
index d5157e4..88cb888 100644
--- a/MrSlim.indigoPlugin/Contents/Info.plist
+++ b/MrSlim.indigoPlugin/Contents/Info.plist
@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>PluginVersion</key>
-	<string>0.1.1</string>
+	<string>0.1.2</string>
 	<key>ServerApiVersion</key>
 	<string>2.0</string>
 	<key>IwsApiVersion</key>
diff --git a/MrSlim.indigoPlugin/Contents/Server Plugin/Devices.xml b/MrSlim.indigoPlugin/Contents/Server Plugin/Devices.xml
index 75ee964..6ed671d 100644
--- a/MrSlim.indigoPlugin/Contents/Server Plugin/Devices.xml	
+++ b/MrSlim.indigoPlugin/Contents/Server Plugin/Devices.xml	
@@ -1,48 +1,11 @@
 <?xml version="1.0"?>
-<!-- If your plugin defines device types, you can define them here.
-
-	 Devices must specify their type (via the type attribute):
-
-		relay (ON/OFF/STATUS)
-		dimmer (ON/OFF/DIM/BRIGHTEN/SET BRIGHTNESS/STATUS)
-		speedcontrol (ON/OFF/SET SPEED LEVEL/SET SPEED INDEX/INCREASE/DECREASE/STATUS)
-		sensor (ON/OFF/STATUS)
-		thermostat
-		sprinkler
-		custom
-
-	 The first six inherit states, actions and events from Indigo. You can
-	 also specify your own custom actions and additional states, if needed.
-
-	 The Device example below specifies the thermostat type.
-	 
-	 Devices must also specify a unique typeID - so, for instance, if you define
-	 2 different thermostat type devices then your plugin can distinguish between
-	 the two by the typeID.
--->
-
 <Devices>
-	<!-- This device illustrates how a plugin can inherit Indigo's thermostat
-	device behavior including thermostat device states, thermostat actions,
-	and will support Indigo and Indigo Touch's native UI for thermostat type
-	devices.
-	-->
 	<Device type="thermostat" id="MrSlimThermo">
 		<Name>MrSlim Thermostat Module</Name>
 		<ConfigUI>
-			<!-- The ConfigUI here is just an example of the type of device
-			specific UI that might be needed. Here you might specify a text
-			field for an IP address, a serial port popup, or other device
-			specific options.
-			-->
 			<Field id="address" type="textfield"  hidden="true" >
 				<Label/>
 			</Field>
-			
-		<!-- 	<Field id="thermostatId" type="textfield">
-				<Label>Thermostat ID:</Label>
-				<Description>TCC Id for Thermostat.</Description>
-			</Field> -->
 			<Field id="thermostat" type="menu">
 				<Label>Thermostat:</Label>
 				<List class="self" filter="" method="thermostatList"/>
@@ -60,35 +23,9 @@
 			<Field type="textfield" id="ShowCoolHeatEquipmentStateUI" hidden="true">
 				<Label/>
 			</Field>
-			<!--<Field id="password" type="textfield" defaultValue="yourpassword">
-				<Label>HoneyWell TCC Password:</Label>
-			</Field>
-			 By default thermostat type devices automatically inherit these
-			device properties which describe the characteristics of a specific
-			thermostat instance:
-
-				NumTemperatureInputs:			should range between 1 and 3
-				NumHumidityInputs:				should range between 0 and 3
-				ShowCoolHeatEquipmentStateUI:	True or False
-			
-			Plugins can update these properties either in device ConfigUI
-			(like below), or can update them from python by using the
-			dev.replacePluginPropsOnServer() method, most likely inside your
-			deviceStartComm method. Both will trigger
-			the Indigo Server to automatically rebuild the device's states
-			list based on the needed changes. Since most entry-level thermostats
-			have 1 temp sensor and 0 humidity sensors, those are the default
-			values. If your thermostat supports those, you don't need to change
-			anything.
-			-->
 		</ConfigUI>
 		<States>
-			<!-- <State id="macID">
-				<ValueType>String</ValueType>
-				<TriggerLabel>macID</TriggerLabel>
-				<ControlPageLabel>macID</ControlPageLabel>
-			</State>
- -->			<State id="name">
+			<State id="name">
 				<ValueType>String</ValueType>
 				<TriggerLabel>name</TriggerLabel>
 				<ControlPageLabel>name</ControlPageLabel>
@@ -97,16 +34,6 @@
 				<ValueType>String</ValueType>
 				<TriggerLabel>thermostatMode</TriggerLabel>
 				<ControlPageLabel>thermostatMode</ControlPageLabel>
-			</State>	
-			<State id="fanAllowedModes">
-				<ValueType>String</ValueType>
-				<TriggerLabel>fanAllowedModes</TriggerLabel>
-				<ControlPageLabel>fanAllowedModes</ControlPageLabel>
-			</State>
-			<State id="fanMode">
-				<ValueType>String</ValueType>
-				<TriggerLabel>fanMode</TriggerLabel>
-				<ControlPageLabel>fanMode</ControlPageLabel>
 			</State>
 			<State id="maxCoolSetpoint">
 				<ValueType>Float</ValueType>
@@ -128,11 +55,6 @@
 				<TriggerLabel>minHeatSetpoint</TriggerLabel>
 				<ControlPageLabel>minHeatSetpoint</ControlPageLabel>
 			</State>
-			<State id="lastUpdate" hidden="true">
-				<ValueType>String</ValueType>
-				<TriggerLabel>lastUpdate</TriggerLabel>
-				<ControlPageLabel>lastUpdate</ControlPageLabel>
-			</State>
 		</States>
 	</Device>
 </Devices>
diff --git a/MrSlim.indigoPlugin/Contents/Server Plugin/MenuItems.xml b/MrSlim.indigoPlugin/Contents/Server Plugin/MenuItems.xml
index aa5846e..40520dd 100644
--- a/MrSlim.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
+++ b/MrSlim.indigoPlugin/Contents/Server Plugin/MenuItems.xml	
@@ -1,11 +1,4 @@
 <?xml version="1.0"?>
-<!-- If your plugin wants to add menu items to it's submenu off the new Extensions menu,
-	 define them here. Each should have a unique menu id, a Name, and an Action. The last
-	 is a method name in your python file that will be called when the user selects that
-	 menu item. Note - nothing will be returned to the client, so if you need to communicate
-	 back to the user you can post information into the Event Log.
--->
-
 <MenuItems>
 	<MenuItem id="menu1">
 		<Name>Show Available Thermostats in Event Log</Name>
@@ -25,4 +18,3 @@
         <CallbackMethod>forceUpdate</CallbackMethod>
     </MenuItem>
 </MenuItems>
-
diff --git a/MrSlim.indigoPlugin/Contents/Server Plugin/PluginConfig.xml b/MrSlim.indigoPlugin/Contents/Server Plugin/PluginConfig.xml
index b49e34f..ada330e 100644
--- a/MrSlim.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
+++ b/MrSlim.indigoPlugin/Contents/Server Plugin/PluginConfig.xml	
@@ -4,10 +4,10 @@
 		<Label>Total Connect Comfort MrSlim Plugin</Label>
 	</Field>
 	<Field type="textfield" id="UserID" tooltip="MrSlim User ID" visibleBindingValue="true">
-		<Label>MrSlim TCC User ID:</Label>
+		<Label>MrSlim User ID:</Label>
 	</Field>
 	<Field type="textfield" id="Password" secure="true" tooltip="MrSlim Password" visibleBindingValue="true">
-		<Label>MrSlim TCC Password:</Label>
+		<Label>MrSlim Password:</Label>
 	</Field>
 	 <Field id="sep1" type="separator"/>
     <Field id="updateFrequency" type="textfield" defaultValue="24">