diff --git a/Models/Interior/Panel/Avionics/if-550a/if-550a-control.xml b/Models/Interior/Panel/Avionics/if-550a/if-550a-control.xml
index 17b01e5..405dfa7 100644
--- a/Models/Interior/Panel/Avionics/if-550a/if-550a-control.xml
+++ b/Models/Interior/Panel/Avionics/if-550a/if-550a-control.xml
@@ -18,6 +18,19 @@
 				<script>if550a.toggleEngaged();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>ap-engaged</tooltip-id>
+				<label>Autopilot: %s</label>
+				<measure-text>Autopilot: Disengaged</measure-text>
+				<property>autopilot/if-550a/engaged</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Disengaged", "Engaged"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -45,6 +58,15 @@
 				<max>10</max>
 			</binding>
 		</shift-action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>ap-target-pitch</tooltip-id>
+				<label>Target pitch: %2.1f°</label>
+				<measure-text>Target pitch -10.0°</measure-text>
+				<property>autopilot/if-550a/target-pitch-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -72,6 +94,30 @@
 				<max>1</max>
 			</binding>
 		</shift-action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>ap-target-turn-rate</tooltip-id>
+				<label>Target turn rate: %s</label>
+				<measure-text>Target turn rate: 3° right per second (standard rate turn)</measure-text>
+				<property>autopilot/if-550a/target-turn-rate</property>
+				<mapping>nasal</mapping>
+				<script><![CDATA[
+					var s = "";
+					if (arg[0] < 0) {
+						s = sprintf("%1.1f° left per second", arg[0]);
+					} elsif (arg[0] > 0) {
+						return sprintf("%1.1f° right per second", arg[0]);
+					} else {
+						return "0° per second";
+					}
+					if (math.abs(arg[0]) == 1) {
+						s ~= " (standard rate turn)";
+					}
+					return s
+				]]></script>
+			</binding>
+		</hovered>
 	</animation>
 	<!--<animation>
 		<type>knob</type>
@@ -121,6 +167,13 @@
 				<value>0</value>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>ap-test</tooltip-id>
+				<label>Push to test autopilot disconnect mechanism</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<text>
diff --git a/Models/Interior/Panel/Avionics/rnav/rnav.xml b/Models/Interior/Panel/Avionics/rnav/rnav.xml
index fcd907d..4f8e5c2 100644
--- a/Models/Interior/Panel/Avionics/rnav/rnav.xml
+++ b/Models/Interior/Panel/Avionics/rnav/rnav.xml
@@ -17,12 +17,21 @@
 				<min>0</min>
 				<max>3</max>
 				<factor>1</factor>
+			</binding>
 			<binding>
 				<command>nasal</command>
 				<script>c210.rnav.updateBearing();</script>
 			</binding>
-			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-bearing</tooltip-id>
+				<label>Waypoint bearing: %3.1f°</label>
+				<measure-text>Waypoint bearing: 359.9°</measure-text>
+				<property>instrumentation/rnav/selected-bearing-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -45,6 +54,15 @@
 				<script>c210.rnav.updateBearing();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-bearing</tooltip-id>
+				<label>Waypoint bearing: %3.1f°</label>
+				<measure-text>Waypoint bearing: 359.9°</measure-text>
+				<property>instrumentation/rnav/selected-bearing-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -67,6 +85,15 @@
 				<script>c210.rnav.updateBearing();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-bearing</tooltip-id>
+				<label>Waypoint bearing: %3.1f°</label>
+				<measure-text>Waypoint bearing: 359.9°</measure-text>
+				<property>instrumentation/rnav/selected-bearing-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -89,6 +116,15 @@
 				<script>c210.rnav.updateBearing();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-bearing</tooltip-id>
+				<label>Waypoint bearing: %3.1f°</label>
+				<measure-text>Waypoint bearing: 359.9°</measure-text>
+				<property>instrumentation/rnav/selected-bearing-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -112,6 +148,15 @@
 				<script>c210.rnav.updateDistance();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-distance</tooltip-id>
+				<label>Waypoint distance: %3.1f°</label>
+				<measure-text>Waypoint distance: 200.0°</measure-text>
+				<property>instrumentation/rnav/selected-distance-nm</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -134,6 +179,15 @@
 				<script>c210.rnav.updateDistance();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-distance</tooltip-id>
+				<label>Waypoint distance: %3.1f°</label>
+				<measure-text>Waypoint distance: 200.0°</measure-text>
+				<property>instrumentation/rnav/selected-distance-nm</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -156,6 +210,15 @@
 				<script>c210.rnav.updateDistance();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-distance</tooltip-id>
+				<label>Waypoint distance: %3.1f°</label>
+				<measure-text>Waypoint distance: 200.0°</measure-text>
+				<property>instrumentation/rnav/selected-distance-nm</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -178,6 +241,15 @@
 				<script>c210.rnav.updateDistance();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-distance</tooltip-id>
+				<label>Waypoint distance: %3.1f°</label>
+				<measure-text>Waypoint distance: 200.0°</measure-text>
+				<property>instrumentation/rnav/selected-distance-nm</property>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -273,6 +345,15 @@
 				<wrap type="bool">true</wrap>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-display-waypoint</tooltip-id>
+				<label>Displayed waypoint: %d</label>
+				<measure-text>Displayed waypoint: 1</measure-text>
+				<property>instrumentation/rnav/display-waypoint</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -297,6 +378,15 @@
 				<script>c210.rnav.updateCurrentWaypoint();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-fly-waypoint</tooltip-id>
+				<label>Fly waypoint: %d</label>
+				<measure-text>Fly waypoint: 1</measure-text>
+				<property>instrumentation/rnav/fly-waypoint</property>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -316,6 +406,19 @@
 				<wrap type="bool">true</wrap>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-mode</tooltip-id>
+				<label>Mode: %s</label>
+				<measure-text>Mode: Enroute</measure-text>
+				<property>instrumentation/rnav/mode</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Enroute", "Approach"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -347,6 +450,13 @@
 				<time>0.01</time>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>rnav-display-waypoint</tooltip-id>
+				<label>Push to transfer selected bearing and distance into waypoint 1 or 2 as selected by the Display switch</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Controls/gear/gear.xml b/Models/Interior/Panel/Controls/gear/gear.xml
index 8b16b6a..3e01561 100644
--- a/Models/Interior/Panel/Controls/gear/gear.xml
+++ b/Models/Interior/Panel/Controls/gear/gear.xml
@@ -42,6 +42,19 @@
 				<property>controls/gear/gear-down</property>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gear-lever</tooltip-id>
+				<label>Gear position: %s</label>
+				<measure-text>Gear position: Down</measure-text>
+				<property>controls/gear/gear-down</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Up", "Down"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<!-- gear lever needs to be pulled out in order to be moveable -->
@@ -90,6 +103,13 @@
 				<property>sim/model/controls/gear/retracted-lamp-test</property>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gear-retracted-lamp</tooltip-id>
+				<label>Gear retracted indicator light (push to test)</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -112,6 +132,13 @@
 				<value>2</value> <!-- test lamp illumination -->
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>gear-extended-lamp</tooltip-id>
+				<label>Gear extended indicator light (push to test)</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Controls/left-controls-panel.xml b/Models/Interior/Panel/Controls/left-controls-panel.xml
index 121293a..09ab1b1 100644
--- a/Models/Interior/Panel/Controls/left-controls-panel.xml
+++ b/Models/Interior/Panel/Controls/left-controls-panel.xml
@@ -21,6 +21,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/nav-lights</property>
+				<tooltip-id>nav-lights</tooltip-id>
+				<label>Nav lights: %s</label>
+				<measure-text>Nav lights: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -34,6 +37,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/beacon</property>
+				<tooltip-id>beacon-light</tooltip-id>
+				<label>Flashing beacon: %s</label>
+				<measure-text>Flashing beacon: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -47,6 +53,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/strobe</property>
+				<tooltip-id>strobe-lights</tooltip-id>
+				<label>Strobe lights: %s</label>
+				<measure-text>Strobe lights: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -60,6 +69,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/logo-lights</property>
+				<tooltip-id>tail-flood-lights</tooltip-id>
+				<label>Tail flood lights: %s</label>
+				<measure-text>Tail flood lights: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -73,6 +85,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/taxi-light</property>
+				<tooltip-id>taxi-light</tooltip-id>
+				<label>Taxi light: %s</label>
+				<measure-text>Taxi light: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -86,6 +101,9 @@
 		<overlay>
 			<params>
 				<property>controls/lighting/landing-lights</property>
+				<tooltip-id>landing-lights</tooltip-id>
+				<label>Landing lights: %s</label>
+				<measure-text>Landing lights: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -100,6 +118,9 @@
 		<overlay>
 			<params>
 				<property>controls/anti-ice/pitot-heat</property>
+				<tooltip-id>pitot-heat</tooltip-id>
+				<label>Pitot heat: %s</label>
+				<measure-text>Pitot heat: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -113,6 +134,9 @@
 		<overlay>
 			<params>
 				<property>controls/anti-ice/propeller-heat</property>
+				<tooltip-id>propeller-heat</tooltip-id>
+				<label>Propeller heat: %s</label>
+				<measure-text>Propeller heat: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -125,7 +149,10 @@
 		</offsets>
 		<overlay>
 			<params>
-				<property>controls/anti-ice/window-heat</property>
+				<property>controls/anti-ice/windshield-heat</property>
+				<tooltip-id>window-heat</tooltip-id>
+				<label>Windshield heat: %s</label>
+				<measure-text>Windshield heat: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -152,6 +179,9 @@
 		<overlay>
 			<params>
 				<property>controls/anti-ice/ice-detector-light</property>
+				<tooltip-id>ice-detection-light</tooltip-id>
+				<label>Ice detection light: %s</label>
+				<measure-text>Ice detection light: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -182,7 +212,13 @@
 		<overlay>
 			<params>
 				<outer-prop>controls/lighting/panel-flood-norm</outer-prop>
+				<outer-label>Panel flood light intensity: %3d%%</outer-label>
+				<outer-measure-text>Panel flood light intensity: 100%</outer-measure-text>
+				<outer-tooltip-id>panel-light-dim-flood</outer-tooltip-id>
 				<inner-prop>controls/lighting/panel-post-norm</inner-prop>
+				<inner-label>Panel post light intensity: %3d%%</inner-label>
+				<inner-measure-text>Panel post light intensity: 100%</inner-measure-text>
+				<inner-tooltip-id>panel-light-dim-post</inner-tooltip-id>
 			</params>
 		</overlay>
 	</model>
@@ -196,7 +232,13 @@
 		<overlay>
 			<params>
 				<outer-prop>controls/lighting/panel-integral-norm</outer-prop>
+				<outer-label>Panel integral light intensity: %3d%%</outer-label>
+				<outer-measure-text>Panel integral light intensity: 100%</outer-measure-text>
+				<outer-tooltip-id>panel-light-dim-integral</outer-tooltip-id>
 				<inner-prop>controls/lighting/panel-electroluminescent-norm</inner-prop>
+				<inner-label>Panel electroluminescent light intensity: %3d%%</inner-label>
+				<inner-measure-text>Panel electroluminescent light intensity: 100%</inner-measure-text>
+				<inner-tooltip-id>panel-light-dim-electroluminescent</inner-tooltip-id>
 			</params>
 		</overlay>
 	</model>
@@ -237,6 +279,9 @@
 		<overlay>
 			<params>
 				<property>controls/electric/engine/master-alt</property>
+				<tooltip-id>master-alt</tooltip-id>
+				<label>Alternator master: %s</label>
+				<measure-text>Alternator master: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -250,6 +295,9 @@
 		<overlay>
 			<params>
 				<property>controls/electric/battery-switch</property>
+				<tooltip-id>master-bat</tooltip-id>
+				<label>Battery master: %s</label>
+				<measure-text>Battery master: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -264,6 +312,9 @@
 		<overlay>
 			<params>
 				<property>controls/alt-static-air</property>
+				<tooltip-id>alt-static-air</tooltip-id>
+				<label>Alternate static source: %s</label>
+				<measure-text>Alternate static source: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
diff --git a/Models/Interior/Panel/Controls/lights/if-550a.xml b/Models/Interior/Panel/Controls/lights/if-550a.xml
index 78ee4ab..6ca40b8 100644
--- a/Models/Interior/Panel/Controls/lights/if-550a.xml
+++ b/Models/Interior/Panel/Controls/lights/if-550a.xml
@@ -21,6 +21,16 @@
 				<factor>0.05</factor>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>if-550a-annun-dim-white</tooltip-id>
+				<label>Autopilot mode selector white light intensity: %3d%%</label>
+				<measure-text>Autopilot mode selector white light intensity: 100%</measure-text>
+				<property>autopilot/if-550a/white-light-intensity-norm</property>
+				<mapping>percent</mapping>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -48,6 +58,16 @@
 				<property>autopilot/if-550a/green-light-test</property>
 			</binding>
 		</shift-action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>if-550a-annun-dim-white</tooltip-id>
+				<label>Autopilot mode selector green light intensity: %3d%%\nPush to test green lights</label>
+				<measure-text>Autopilot mode selector green light intensity: 100%\nPush to test green lights</measure-text>
+				<property>autopilot/if-550a/green-light-intensity-norm</property>
+				<mapping>percent</mapping>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Controls/lights/panel.xml b/Models/Interior/Panel/Controls/lights/panel.xml
index e479ef5..4dbf661 100644
--- a/Models/Interior/Panel/Controls/lights/panel.xml
+++ b/Models/Interior/Panel/Controls/lights/panel.xml
@@ -4,7 +4,13 @@
 	
 	<params>
 		<outer-prop>controls/lighting/panel-flood-norm</outer-prop>
+		<outer-label>Panel flood light intensity: %3d%%</outer-label>
+		<outer-measure-text>Panel flood light intensity: 100%</outer-measure-text>
+		<outer-tooltip-id>panel-light-dim-flood</outer-tooltip-id>
 		<inner-prop>controls/lighting/panel-post-norm</inner-prop>
+		<inner-label>Panel post light intensity: %3d%%</inner-label>
+		<inner-measure-text>Panel post light intensity: 100%</inner-measure-text>
+		<inner-tooltip-id>panel-light-dim-post</inner-tooltip-id>
 	</params>
 	
 	<animation>
@@ -26,6 +32,16 @@
 				<factor>0.05</factor>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id alias="../../../../params/outer-tooltip-id"/>
+				<label alias="../../../../params/outer-label"/>
+				<measure-text alias="../../../../params/outer-measure-text"/>
+				<property alias="../../../../params/outer-prop"/>
+				<mapping>percent</mapping>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -46,6 +62,16 @@
 				<factor>0.05</factor>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id alias="../../../../params/inner-tooltip-id"/>
+				<label alias="../../../../params/inner-label"/>
+				<measure-text alias="../../../../params/inner-measure-text"/>
+				<property alias="../../../../params/inner-prop"/>
+				<mapping>percent</mapping>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<effect>
diff --git a/Models/Interior/Panel/Controls/magnetos/magnetos.xml b/Models/Interior/Panel/Controls/magnetos/magnetos.xml
index e5b134a..356c19c 100644
--- a/Models/Interior/Panel/Controls/magnetos/magnetos.xml
+++ b/Models/Interior/Panel/Controls/magnetos/magnetos.xml
@@ -17,6 +17,13 @@
 				<property>sim/model/controls/magnetos/key-inserted</property>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>magneto-key-in-out</tooltip-id>
+				<label>Press to insert / remove keys</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -84,6 +91,23 @@
 				<value type="bool">false</value>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>magnetos</tooltip-id>
+				<label>Magnetos: %s</label>
+				<measure-text>Magnetos: Start</measure-text>
+				<property>controls/engines/engine/magnetos</property>
+				<mapping>nasal</mapping>
+				<script>
+					if (getprop("controls/engines/engine/starter")) {
+						return "Start";
+					} else {
+						return ["Off", "Left", "Right", "Both"][arg[0]];
+					}
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<effect>
diff --git a/Models/Interior/Panel/Controls/press/dump-valve.xml b/Models/Interior/Panel/Controls/press/dump-valve.xml
index 091e044..df9673a 100644
--- a/Models/Interior/Panel/Controls/press/dump-valve.xml
+++ b/Models/Interior/Panel/Controls/press/dump-valve.xml
@@ -19,6 +19,19 @@
 				<property>controls/pressurization/dump-valve</property>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>cabin-pressure-dump-valve</tooltip-id>
+				<label>Cabin pressure dump valve: %s</label>
+				<measure-text>Cabin pressure dump valve: Closed</measure-text>
+				<property>controls/pressurization/dump-valve</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Closed", "Open"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<effect>
diff --git a/Models/Interior/Panel/Controls/right-controls-panel.xml b/Models/Interior/Panel/Controls/right-controls-panel.xml
index 6099a93..039e613 100644
--- a/Models/Interior/Panel/Controls/right-controls-panel.xml
+++ b/Models/Interior/Panel/Controls/right-controls-panel.xml
@@ -21,6 +21,9 @@
 		<overlay>
 			<params>
 				<property>controls/cabin-air/cabin-heat</property>
+				<tooltip-id>cabin-heat</tooltip-id>
+				<label>Cabin heat: %s</label>
+				<measure-text>Cabin heat: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -35,6 +38,9 @@
 		<overlay>
 			<params>
 				<property>controls/cabin-air/defrost</property>
+				<tooltip-id>cabin-defrost</tooltip-id>
+				<label>Cabin defrost: %s</label>
+				<measure-text>Cabin defrost: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
@@ -58,6 +64,9 @@
 		<overlay>
 			<params>
 				<property>controls/cabin-air/floor-defrost</property>
+				<tooltip-id>floor-defrost</tooltip-id>
+				<label>Floor defrost: %s</label>
+				<measure-text>Floor defrost: Off</measure-text>
 			</params>
 		</overlay>
 	</model>
diff --git a/Models/Interior/Panel/Controls/switches/fuelpump-hi.xml b/Models/Interior/Panel/Controls/switches/fuelpump-hi.xml
index 4182933..a99a656 100644
--- a/Models/Interior/Panel/Controls/switches/fuelpump-hi.xml
+++ b/Models/Interior/Panel/Controls/switches/fuelpump-hi.xml
@@ -20,7 +20,7 @@
 			</binding>
 			<binding>
 				<command>property-assign</command>
-				<!-- the HI switch is mechanically tripped to the LO switch so that the latter gets switched on along with the HI switch when pressed and LO no on -->
+				<!-- the HI switch is mechanically tripped to the LO switch so that the latter gets switched on along with the HI switch when pressed and LO not on -->
 				<property>controls/engines/engine/fuel-pump</property>
 				<value type="bool">true</value>
 			</binding>
@@ -32,5 +32,18 @@
 				<value type="bool">false</value>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>fuel-pump-hi</tooltip-id>
+				<label>Fuel pump speed: %s</label>
+				<measure-text>Fuel pump speed: High</measure-text>
+				<property>controls/engines/engine/fuel-pump-hi</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Low", "High"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 </PropertyList>
diff --git a/Models/Interior/Panel/Controls/switches/fuelpump.xml b/Models/Interior/Panel/Controls/switches/fuelpump.xml
index 1c15cd5..ee38147 100644
--- a/Models/Interior/Panel/Controls/switches/fuelpump.xml
+++ b/Models/Interior/Panel/Controls/switches/fuelpump.xml
@@ -18,5 +18,18 @@
 				<property>controls/engines/engine/fuel-pump</property>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>fuel-pump</tooltip-id>
+				<label>Fuel pump: %s</label>
+				<measure-text>Fuel pump: Off</measure-text>
+				<property>controls/engines/engine/fuel-pump</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 </PropertyList>
diff --git a/Models/Interior/Panel/Controls/switches/master.xml b/Models/Interior/Panel/Controls/switches/master.xml
index 48742b9..55c9aae 100644
--- a/Models/Interior/Panel/Controls/switches/master.xml
+++ b/Models/Interior/Panel/Controls/switches/master.xml
@@ -4,6 +4,9 @@
 	
 	<params>
 		<property>controls/engines/engine/master-alt</property>
+		<tooltip-id>master-alt</tooltip-id>
+		<label>Alternator master: %s</label>
+		<measure-text>Alternator master: Off</measure-text>
 	</params>
 	
 	<animation>
@@ -22,5 +25,18 @@
 				<property alias="../../../../params/property"/>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id alias="../../../../params/tooltip-id"/>
+				<label alias="../../../../params/label"/>
+				<measure-text alias="../../../../params/measure-text"/>
+				<property alias="../../../../params/property"/>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 </PropertyList>
diff --git a/Models/Interior/Panel/Controls/switches/pressurize.xml b/Models/Interior/Panel/Controls/switches/pressurize.xml
index 5e98dee..9493e0a 100644
--- a/Models/Interior/Panel/Controls/switches/pressurize.xml
+++ b/Models/Interior/Panel/Controls/switches/pressurize.xml
@@ -21,6 +21,19 @@
 				<factor>1</factor>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>pressurize-switch</tooltip-id>
+				<label>Pressurization: %s</label>
+				<measure-text>Pressurization: Off</measure-text>
+				<property>controls/pressurization/pressurize</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<effect>
diff --git a/Models/Interior/Panel/Controls/switches/white.xml b/Models/Interior/Panel/Controls/switches/white.xml
index 50f61bc..18ebad9 100644
--- a/Models/Interior/Panel/Controls/switches/white.xml
+++ b/Models/Interior/Panel/Controls/switches/white.xml
@@ -4,6 +4,9 @@
 	
 	<params>
 		<property>none</property>
+		<tooltip-id>none</tooltip-id>
+		<label>none</label>
+		<measure-text>none</measure-text>
 	</params>
 	
 	<animation>
@@ -22,5 +25,18 @@
 				<property alias="../../../../params/property"/>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id alias="../../../../params/tooltip-id"/>
+				<label alias="../../../../params/label"/>
+				<measure-text alias="../../../../params/measure-text"/>
+				<property alias="../../../../params/property"/>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 </PropertyList>
diff --git a/Models/Interior/Panel/Controls/switches/wing-deice.xml b/Models/Interior/Panel/Controls/switches/wing-deice.xml
index 0f46732..8e109b2 100644
--- a/Models/Interior/Panel/Controls/switches/wing-deice.xml
+++ b/Models/Interior/Panel/Controls/switches/wing-deice.xml
@@ -27,5 +27,12 @@
 				<time>0.01</time>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>wing-deice</tooltip-id>
+				<label>Initiate wing deice cycle</label>
+			</binding>
+		</hovered>
 	</animation>
 </PropertyList>
diff --git a/Models/Interior/Panel/Controls/valve/valve.xml b/Models/Interior/Panel/Controls/valve/valve.xml
index 737b583..0c96257 100644
--- a/Models/Interior/Panel/Controls/valve/valve.xml
+++ b/Models/Interior/Panel/Controls/valve/valve.xml
@@ -2,6 +2,13 @@
 <PropertyList>
 	<path>valve.ac</path>
 	
+	<params>
+		<property>none</property>
+		<tooltip-id>none</tooltip-id>
+		<label>none</label>
+		<measure-text>none</measure-text>
+	</params>
+	
 	<animation>
 		<type>slider</type>
 		<object-name>Handle</object-name>
@@ -20,6 +27,19 @@
 				<property alias="../../../../params/property"/>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id alias="../../../../params/tooltip-id"/>
+				<label alias="../../../../params/label"/>
+				<measure-text alias="../../../../params/measure-text"/>
+				<property alias="../../../../params/property"/>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<effect>
diff --git a/Models/Interior/Panel/Instruments/aa-801a/aa-801a.xml b/Models/Interior/Panel/Instruments/aa-801a/aa-801a.xml
index dc65e5b..151f72d 100644
--- a/Models/Interior/Panel/Instruments/aa-801a/aa-801a.xml
+++ b/Models/Interior/Panel/Instruments/aa-801a/aa-801a.xml
@@ -31,6 +31,13 @@
 				<time>0.01</time>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>alt-alert-arm</tooltip-id>
+				<label>Arm autopilot altitude capture</label>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Instruments/ai/attitude-indicator.xml b/Models/Interior/Panel/Instruments/ai/attitude-indicator.xml
index f9642cb..09ab554 100644
--- a/Models/Interior/Panel/Instruments/ai/attitude-indicator.xml
+++ b/Models/Interior/Panel/Instruments/ai/attitude-indicator.xml
@@ -74,11 +74,29 @@
 			<binding>
 				<command>property-adjust</command>
 				<property>instrumentation/attitude-indicator/pitch-offset-deg</property>
-				<factor>0.25</factor>
+				<factor>1</factor>
 				<min>-10</min>
 				<max>10</max>
 			</binding>
 		</action>
+		<shift-action>
+			<binding>
+				<command>property-adjust</command>
+				<property>instrumentation/attitude-indicator/pitch-offset-deg</property>
+				<factor>0.1</factor>
+				<min>-10</min>
+				<max>10</max>
+			</binding>
+		</shift-action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>attitude-indicator-pitch-offset</tooltip-id>
+				<label>Symbolic airplane vertical offset: %.1f°</label>
+				<measure-text>Symbolic airplane vertcal offset: 10.0°</measure-text>
+				<property>instrumentation/attitude-indicator/pitch-offset-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	 <text>
 		<name>Label</name>
diff --git a/Models/Interior/Panel/Instruments/alt/alt.xml b/Models/Interior/Panel/Instruments/alt/alt.xml
index 96c004c..a4799a7 100644
--- a/Models/Interior/Panel/Instruments/alt/alt.xml
+++ b/Models/Interior/Panel/Instruments/alt/alt.xml
@@ -182,6 +182,15 @@
 				<wrap>false</wrap>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>altimeter-baroset</tooltip-id>
+				<label>Pressure setting: %2.2f inHg</label>
+				<measure-text>Pressure setting: 29.92 inHg</measure-text>
+				<property>instrumentation/altimeter/setting-inhg</property>
+			</binding>
+		</hovered>
 	</animation>
 	 <text>
 		<name>Label</name>
diff --git a/Models/Interior/Panel/Instruments/alt/standby-alt.xml b/Models/Interior/Panel/Instruments/alt/standby-alt.xml
index 579de70..140d5f0 100644
--- a/Models/Interior/Panel/Instruments/alt/standby-alt.xml
+++ b/Models/Interior/Panel/Instruments/alt/standby-alt.xml
@@ -96,6 +96,15 @@
 				<wrap>false</wrap>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>altimeter-baroset</tooltip-id>
+				<label>Pressure setting: %2.2f inHg</label>
+				<measure-text>Pressure setting: 29.92 inHg</measure-text>
+				<property>instrumentation/altimeter[1]/setting-inhg</property>
+			</binding>
+		</hovered>
 	</animation>
 	 <text>
 		<name>Label</name>
diff --git a/Models/Interior/Panel/Instruments/dme/dme.xml b/Models/Interior/Panel/Instruments/dme/dme.xml
index 960c043..b4804c9 100644
--- a/Models/Interior/Panel/Instruments/dme/dme.xml
+++ b/Models/Interior/Panel/Instruments/dme/dme.xml
@@ -23,6 +23,19 @@
 				<script>c210.dme.sourceChanged();</script>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>dme-source</tooltip-id>
+				<label>DME source: %s</label>
+				<measure-text>DME source: RNAV</measure-text>
+				<property>instrumentation/dme/source-knob</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["NAV1", "HOLD", "NAV2", "RNAV"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
@@ -70,6 +83,19 @@
 				<script>c210.dme.modeChanged();</script>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>dme-mode</tooltip-id>
+				<label>DME mode: %s</label>
+				<measure-text>DME mode: Test</measure-text>
+				<property>instrumentation/dme/mode</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Off", "On", "Test"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	<animation>
 		<type>knob</type>
@@ -89,6 +115,19 @@
 				<wrap type="bool">true</wrap>
 			</binding>
 		</action>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>dme-display-mode</tooltip-id>
+				<label>Display mode: %s</label>
+				<measure-text>Display mode: Time-to-station</measure-text>
+				<property>instrumentation/dme/display-mode</property>
+				<mapping>nasal</mapping>
+				<script>
+					return ["Time-to-station", "Groundspeed"][arg[0]];
+				</script>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Instruments/piston/egt.xml b/Models/Interior/Panel/Instruments/piston/egt.xml
index 3505fb8..25119d3 100644
--- a/Models/Interior/Panel/Instruments/piston/egt.xml
+++ b/Models/Interior/Panel/Instruments/piston/egt.xml
@@ -79,8 +79,8 @@
 			<binding>
 				<command>set-tooltip</command>
 				<tooltip-id>egt-indicator</tooltip-id>
-				<label>Current EGT temperature: %4d °F\nTarget EGT temperature:  %4d °F</label>
-				<measure-text>Current EGT temperature: 1700 °F\nTarget EGT temperature: 1700 °F</measure-text>
+				<label>Current EGT: %4d °F\nTarget EGT:  %4d °F</label>
+				<measure-text>Current EGT: 1700 °F\nTarget EGT: 1700 °F</measure-text>
 				<property>instrumentation/engine/indicated-egt-degf</property>
 				<property>instrumentation/engine/target-egt-degf</property>
 			</binding>
diff --git a/Models/Interior/Panel/Instruments/vor/vor.xml b/Models/Interior/Panel/Instruments/vor/vor.xml
index 6aed26d..e631630 100644
--- a/Models/Interior/Panel/Instruments/vor/vor.xml
+++ b/Models/Interior/Panel/Instruments/vor/vor.xml
@@ -94,6 +94,15 @@
 				<time>0.1</time>
 			</binding>
 		</release>
+		<hovered>
+			<binding>
+				<command>set-tooltip</command>
+				<tooltip-id>cdi2-obs</tooltip-id>
+				<label>NAV2 radial: %3d°</label>
+				<measure-text>NAV2 radial: 359°</measure-text>
+				<property>instrumentation/nav[1]/radials/selected-deg</property>
+			</binding>
+		</hovered>
 	</animation>
 	
 	<animation>
diff --git a/Models/Interior/Panel/Instruments/vsi/vsi.xml b/Models/Interior/Panel/Instruments/vsi/vsi.xml
index acac685..5e19ec1 100644
--- a/Models/Interior/Panel/Instruments/vsi/vsi.xml
+++ b/Models/Interior/Panel/Instruments/vsi/vsi.xml
@@ -20,7 +20,8 @@
 		<min-deg>-171</min-deg>
 		<max-deg>171</max-deg>
 	</animation>
-		 <text>
+	
+	<text>
 		<name>Label</name>
 		<type type="string">literal</type>
 		<text type="string">Vertical Speed Indicator</text>
diff --git a/Nasal/radios.nas b/Nasal/radios.nas
index deb2be4..f85a746 100644
--- a/Nasal/radios.nas
+++ b/Nasal/radios.nas
@@ -333,9 +333,9 @@ var DMEDisplays = {
 			me.speedTimeDisplay.ktsAnnun.show();
 			me.speedTimeDisplay.minAnnun.show();
 			
-			me.distanceDisplay.text.setText("000.0");
+			me.distanceDisplay.text.setText("188.8");
 			me.distanceDisplay.text.show();
-			me.speedTimeDisplay.text.setText("000");
+			me.speedTimeDisplay.text.setText("888");
 			me.speedTimeDisplay.text.show();
 		} else {
 			# normal operation
diff --git a/Systems/electrical.xml b/Systems/electrical.xml
index 91df059..01c8ef8 100644
--- a/Systems/electrical.xml
+++ b/Systems/electrical.xml
@@ -506,8 +506,8 @@
 						<value>28</value>
 						<sum>
 							<prod>
-								<property>/systems/electrical/buses/primary/consumers/cabin-lights/ice-detector-light-amps</property>
-								<property>/controls/lighting/ice-detector-light</property>
+								<property>/systems/electrical/buses/primary/consumers/cabin-lights/ice-detection-light-amps</property>
+								<property>/controls/lighting/ice-detection-light</property>
 							</prod>
 							<prod>
 								<property>/systems/electrical/buses/primary/consumers/cabin-lights/dome-courtesy-baggage-lights-amps</property>
diff --git a/Systems/generic-electrical.xml b/Systems/generic-electrical.xml
deleted file mode 100644
index ef4ec0d..0000000
--- a/Systems/generic-electrical.xml
+++ /dev/null
@@ -1,240 +0,0 @@
-<?xml version="1.0"?>
- 
-<PropertyList>
-
-  <!-- Supplier list -->
-
-  <supplier>
-    <name>Battery</name>
-    <prop>/systems/electrical/suppliers/battery</prop>
-    <kind>battery</kind>
-    <volts>24</volts>
-    <amp-hours>12.75</amp-hours>
-  </supplier>
-
-  <supplier>
-    <name>Alternator</name>
-    <prop>/systems/electrical/suppliers/alternator</prop>
-    <kind>alternator</kind>
-    <rpm-source>/engines/engine[0]/rpm</rpm-source>
-    <volts>28</volts>
-    <amps>60</amps>
-  </supplier>
-
-  <supplier>
-    <name>Ground power plug</name>
-    <prop>/systems/electrical/suppliers/external</prop>
-    <kind>external</kind>
-    <volts>0</volts> <!-- by default not connected -->
-    <amps>0</amps>
-  </supplier>
-
-  <!-- Bus list -->
-
-  <bus>
-    <name>Master Bus</name>
-    <prop>/systems/electrical/outputs/bus[0]</prop>
-    <!-- Avionics outputs tied directly to bus, note that this is a -->
-    <!-- simple way to provide electrical outputs if you don't need -->
-    <!-- to put a circuit breaker or switch in front of the output. -->
-    <!-- *AND* if you don't care about back propogating the output -->
-    <!-- current. -->
-    <prop>/systems/electrical/outputs/avionics-fan</prop>
-    <prop>/systems/electrical/outputs/hsi</prop>
-    <prop>/systems/electrical/outputs/nav[0]</prop>
-    <prop>/systems/electrical/outputs/nav[1]</prop>
-    <prop>/systems/electrical/outputs/dme</prop>
-    <prop>/systems/electrical/outputs/adf</prop>
-    <prop>/systems/electrical/outputs/transponder</prop>
-    <prop>/systems/electrical/outputs/audio-panel[0]</prop>
-    <prop>/systems/electrical/outputs/autopilot</prop>
-  </bus>
-
-  <!-- Generic Outputs -->
-
-  <output>
-    <name>Starter 1 Power</name>
-    <prop>/systems/electrical/outputs/starter[0]</prop>
-  </output>
-
-  <output>
-    <name>Cabin Lights Power</name>
-    <prop>/systems/electrical/outputs/cabin-lights</prop>
-  </output>
-
-  <output>
-    <name>Instrument Power</name>
-    <prop>/systems/electrical/outputs/instr-ignition-switch</prop>
-  </output>
-
-  <output>
-    <name>Fuel Pump Power</name>
-    <prop>/systems/electrical/outputs/fuel-pump</prop>
-  </output>
-
-  <output>
-    <name>Landing Light Power</name>
-    <prop>/systems/electrical/outputs/landing-light</prop>
-  </output>
-
-  <output>
-    <name>Beacon Power</name>
-    <prop>/systems/electrical/outputs/beacon</prop>
-  </output>
-
-  <output>
-    <name>Flaps Power</name>
-    <prop>/systems/electrical/outputs/flaps</prop>
-  </output>
-
-  <output>
-    <name>Turn Coordinator Power</name>
-    <prop>/systems/electrical/outputs/turn-coordinator</prop>
-  </output>
-
-  <output>
-    <name>Map Lights Power</name>
-    <prop>/systems/electrical/outputs/map-lights</prop>
-  </output>
-
-  <output>
-    <name>Instrument Lights Power</name>
-    <prop>/systems/electrical/outputs/instrument-lights</prop>
-  </output>
-
-  <output>
-    <name>Strobe Lights Power</name>
-    <prop>/systems/electrical/outputs/strobe-lights</prop>
-  </output>
-
-  <output>
-    <name>Pitot Heat Power</name>
-    <prop>/systems/electrical/outputs/pitot-heat</prop>
-  </output>
-
-
-  <!-- connect in power sources -->
-
-  <connector>
-    <input>Alternator</input>
-    <output>Master Bus</output>
-    <switch>
-      <prop>/controls/engines/engine[0]/master-alt</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Ground power plug</input>
-    <output>Master Bus</output>
-  </connector>
-
-  <connector>
-    <input>Battery</input>
-    <output>Master Bus</output>
-    <switch>
-      <prop>/controls/engines/engine[0]/master-bat</prop>
-    </switch>
-  </connector>
-
-  <!-- connect starter output -->
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Starter 1 Power</output>
-    <switch>
-      <prop>/controls/engines/engine[0]/starter</prop>
-      <initial-state>off</initial-state>
-    </switch>
-  </connector>
-
-  <!-- connect master bus outputs -->
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Cabin Lights Power</output>
-    <switch>
-      <prop>/controls/circuit-breakers/cabin-lights-pwr</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Instrument Power</output>
-    <switch>
-      <prop>/controls/circuit-breakers/instr-ignition-switch</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Fuel Pump Power</output>
-    <switch>
-      <prop>/controls/engines/engine[0]/fuel-pump</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Landing Light Power</output>
-    <switch>
-      <prop>/controls/switches/landing-light</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Beacon Power</output>
-    <switch>
-      <prop>/controls/switches/flashing-beacon</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Flaps Power</output>
-    <switch>
-      <prop>/controls/circuit-breakers/flaps</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Turn Coordinator Power</output>
-    <switch>
-      <prop>/controls/circuit-breakers/turn-coordinator</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Map Lights Power</output>
-    <switch>
-      <prop>/controls/switches/nav-lights</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Instrument Lights Power</output>
-    <switch>
-      <prop>/controls/circuit-breakers/instrument-lights</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Strobe Lights Power</output>
-    <switch>
-      <prop>/controls/switches/strobe-lights</prop>
-    </switch>
-  </connector>
-
-  <connector>
-    <input>Master Bus</input>
-    <output>Pitot Heat Power</output>
-    <switch>
-      <prop>/controls/switches/pitot-heat</prop>
-    </switch>
-  </connector>
-
-</PropertyList>
diff --git a/set-base.xml b/set-base.xml
index 1fc0e49..519d0f1 100644
--- a/set-base.xml
+++ b/set-base.xml
@@ -151,7 +151,7 @@
 			<path>/controls/electric/circuit-breakers</path>
 			<path>/controls/anti-ice/pitot-heat</path>
 			<path>/controls/anti-ice/wing-deice</path>
-			<path>/controls/anti-ice/ice-detector-light</path>
+			<path>/controls/anti-ice/ice-detection-light</path>
 			<path>/controls/anti-ice/window-heat</path>
 			<path>/controls/anti-ice/propeller-heat</path>
 			<path>/controls/flight/rudder</path>
@@ -358,7 +358,7 @@
 		<anti-ice>
 			<window-heat type="bool">false</window-heat>
 			<wing-deice type="bool">false</wing-deice>
-			<ice-detector-light type="bool">false</ice-detector-light>
+			<ice-detection-light type="bool">false</ice-detection-light>
 			<propeller-heat type="bool">false</propeller-heat>
 			<pitot-heat type="bool">false</pitot-heat>
 		</anti-ice>
@@ -541,7 +541,7 @@
 							<radio-lights-amps type="double">0.5</radio-lights-amps>
 						</radio-instrument-lights>
 						<cabin-lights>
-							<ice-detector-light-amps type="double">1.5</ice-detector-light-amps>
+							<ice-detection-light-amps type="double">1.5</ice-detection-light-amps>
 							<dome-courtesy-baggage-lights-amps type="double">1.2</dome-courtesy-baggage-lights-amps>
 							<!-- all other cabin lights guessed -->
 							<low-voltage-warning-light-amps type="double">1.5</low-voltage-warning-light-amps>