diff --git a/Aircraft/Instruments-3d/alt/alt.xml b/Aircraft/Instruments-3d/alt/alt.xml
index 73beb27c2..9d11cb51e 100644
--- a/Aircraft/Instruments-3d/alt/alt.xml
+++ b/Aircraft/Instruments-3d/alt/alt.xml
@@ -125,121 +125,36 @@
 
   <!--             Altimeter              -->  
 
- <animation>
-  <type>pick</type>
-  <object-name>click-L</object-name>
-  <visible>false</visible>
-  <action>
-    <name>decrease calibrate fine</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>-0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>decrease calibrate coarse</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>-0.1</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>decrease calibrate fine (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>-0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>increase calibrate fine (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
- </animation>
+  <animation>
+   <type>knob</type>
+   <object-name>click-L</object-name>
+   <object-name>click-R</object-name>
+   <visible>false</visible>
+   
+   <action>
 
- <animation>
-  <type>pick</type>
-  <object-name>click-R</object-name>
-  <visible>false</visible>
-  <action>
-    <name>increase calibrate fine</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
+     <binding>
+       <command>property-adjust</command>
+       <property>/instrumentation/altimeter/setting-inhg</property>
+       <factor>0.01</factor>
+       <min>26.0</min>
+       <max>33.0</max>
+       <wrap>false</wrap>
+     </binding>
+   </action>
+   
+   <hovered>
     <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>increase calibrate coarse</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>0.1</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>decrease calibrate fine (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>-0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>increase calibrate fine (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/altimeter/setting-inhg</property>
-      <step>0.01</step>
-      <min>26.0</min>
-      <max>33.0</max>
-      <wrap>false</wrap>
-    </binding>
-  </action>
- </animation>
+      <command>set-tooltip</command>
+      <tooltip-id>alt-setting</tooltip-id>
+      <label>Altimeter In Hg: %5.2f</label>
+      <property>instrumentation/altimeter/setting-inhg</property>
+   </binding>
+   </hovered>
+   
+  </animation>
+   
+ 
 
 </PropertyList>
 
diff --git a/Aircraft/Instruments-3d/mag-compass.xml b/Aircraft/Instruments-3d/mag-compass.xml
index 9ac374a61..e7ba098e8 100644
--- a/Aircraft/Instruments-3d/mag-compass.xml
+++ b/Aircraft/Instruments-3d/mag-compass.xml
@@ -15,4 +15,18 @@
   </axis>
  </animation>
 
+
+ <animation>
+   <type>pick</type>
+   <object-name>Ring</object-name>
+   <hovered>
+       <binding>
+         <command>set-tooltip</command>
+         <tooltip-id>airspeed</tooltip-id>
+         <label>Magnetic heading: %3d</label>
+         <property>instrumentation/magnetic-compass/indicated-heading-deg</property>
+         <mapping>heading</mapping>
+    </binding>
+   </hovered>
+ </animation>
 </PropertyList>
diff --git a/Aircraft/Instruments-3d/magneto-switch/mags.xml b/Aircraft/Instruments-3d/magneto-switch/mags.xml
index d7086eb8d..17a88fe9c 100644
--- a/Aircraft/Instruments-3d/magneto-switch/mags.xml
+++ b/Aircraft/Instruments-3d/magneto-switch/mags.xml
@@ -19,37 +19,38 @@
 
 <!--		magneto switch		-->
  <animation>
-   <type>pick</type>
+   <type>knob</type>
    <object-name>click-L</object-name>
-   <visible>false</visible>
-   <action>
-     <name>decrease mags</name>
-     <button>0</button>
-     <binding>
-       <command>property-adjust</command>
-       <property>/controls/engines/engine/magnetos</property>
-       <step>-1</step>
-       <min>0</min>
-       <max>3</max>
-     </binding>
-   </action>
- </animation>
- <animation>
-   <type>pick</type>
    <object-name>click-R</object-name>
+   
    <visible>false</visible>
    <action>
-     <name>increase mags</name>
-     <button>0</button>
      <binding>
        <command>property-adjust</command>
        <property>/controls/engines/engine/magnetos</property>
-       <step>1</step>
+       <factor>1</factor>
        <min>0</min>
        <max>3</max>
      </binding>
    </action>
+   <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>magneto-switch</tooltip-id>
+       <label>Magnetos: %s</label>
+       <property>controls/engines/engine/magnetos</property>
+       <mapping>nasal</mapping>
+       <script>
+         var m = getprop('controls/engines/engine/magnetos');
+         if (m == 1) return 'RIGHT';
+         if (m == 2) return 'LEFT';
+         if (m == 3) return 'BOTH';
+         return 'OFF';
+       </script>
+    </binding>
+  </hovered>
  </animation>
+ 
 
 <!--		Starter		-->
  <animation>
@@ -72,6 +73,15 @@
        </binding>
      </mod-up>
    </action>
+   
+   <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>starter-switch</tooltip-id>
+       <label>Engine Starter</label>
+    </binding>
+  </hovered>
+  
  </animation>
 <!--   key animations  -->   
  <animation>
diff --git a/Aircraft/Instruments-3d/vor/vor.xml b/Aircraft/Instruments-3d/vor/vor.xml
index b5c193265..7270f26f5 100644
--- a/Aircraft/Instruments-3d/vor/vor.xml
+++ b/Aircraft/Instruments-3d/vor/vor.xml
@@ -141,121 +141,39 @@
  </animation>
 
 <!--	VOR 1 Radial adjust  -->
- <animation>
-  <type>pick</type>
-  <object-name>click-L</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small decrease</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>large decrease</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>-5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
- </animation>
 
- <animation>
-  <type>pick</type>
-  <object-name>click-R</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small increase</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
+<animation>
+    <type>knob</type>
+     <type>pick</type>
+     <object-name>click-R</object-name>
+      <object-name>click-L</object-name>
+     <visible>false</visible>
+
+     <shift-repeat type="int">5</shift-repeat>
+     
+     <action>
+         <binding>
+           <command>property-adjust</command>
+           <property>/instrumentation/nav/radials/selected-deg</property>
+           <factor>1</factor>
+           <min>0</min>
+           <max>360</max>
+           <wrap>1</wrap>
+         </binding>
+    </action>
+    
+    <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>nav1-obs</tooltip-id>
+       <label>Nav 1 Radial %3d</label>
+       <mapping>heading</mapping>
+       <property>/instrumentation/nav/radials/selected-deg</property>
     </binding>
-  </action>
-  <action>
-    <name>large increase</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
+    </hovered>
  </animation>
+     
+ 
 
  <animation>
   <name>Alpha Order Group</name>
diff --git a/Aircraft/Instruments-3d/vor/vor2.xml b/Aircraft/Instruments-3d/vor/vor2.xml
index 7e3156f91..b1d39db0b 100644
--- a/Aircraft/Instruments-3d/vor/vor2.xml
+++ b/Aircraft/Instruments-3d/vor/vor2.xml
@@ -141,120 +141,36 @@
  </animation>
 
 <!--	VOR 2 Radial adjust  -->
- <animation>
-  <type>pick</type>
-  <object-name>click-L</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small decrease</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>large decrease</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>-5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
- </animation>
 
- <animation>
-  <type>pick</type>
-  <object-name>click-R</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small increase</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
+<animation>
+    <type>knob</type>
+     <type>pick</type>
+     <object-name>click-R</object-name>
+      <object-name>click-L</object-name>
+     <visible>false</visible>
+
+     <shift-repeat type="int">5</shift-repeat>
+     
+     <action>
+         <binding>
+           <command>property-adjust</command>
+           <property>/instrumentation/nav[1]/radials/selected-deg</property>
+           <factor>1</factor>
+           <min>0</min>
+           <max>360</max>
+           <wrap>1</wrap>
+         </binding>
+    </action>
+    
+    <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>nav2-obs</tooltip-id>
+       <label>Nav 2 Radial %3d</label>
+       <mapping>heading</mapping>
+       <property>/instrumentation/nav[1]/radials/selected-deg</property>
     </binding>
-  </action>
-  <action>
-    <name>large increase</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>/instrumentation/nav[1]/radials/selected-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
+    </hovered>
  </animation>
 
  <animation>
diff --git a/Aircraft/c172p/Instruments/AI/AI.xml b/Aircraft/c172p/Instruments/AI/AI.xml
index 11fd2316e..199b1e745 100644
--- a/Aircraft/c172p/Instruments/AI/AI.xml
+++ b/Aircraft/c172p/Instruments/AI/AI.xml
@@ -72,36 +72,52 @@
    <z>0</z>
   </axis>
  </animation>
-
- <animation>
-  <type>pick</type>
-  <visible>false</visible>
-  <object-name>AdjustCCW</object-name>
-  <action>
-   <button>0</button>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>instrumentation/attitude-indicator/horizon-offset-deg</property>
-    <step type="double">-0.5</step>
-   </binding>          
-  </action>
- </animation>
-
+ 
+ <!-- simply hide these -->
  <animation>
   <type>pick</type>
   <visible>false</visible>
   <object-name>AdjustCW</object-name>
-  <action>
-   <button>0</button>
-   <repeatable>true</repeatable>
-   <binding>
-    <command>property-adjust</command>
-    <property>instrumentation/attitude-indicator/horizon-offset-deg</property>
-    <step type="double">0.5</step>
-   </binding>          
-  </action>
+  <object-name>AdjustCCW</object-name>
  </animation>
+ 
+<animation>
+ <type>knob</type>
+ <object-name>AdjustKnob</object-name>
+  
+ <action>
+  <repeatable>true</repeatable>
+  <binding>
+   <command>property-adjust</command>
+   <property>instrumentation/attitude-indicator/horizon-offset-deg</property>
+   <factor type="double">0.5</factor>
+  </binding>          
+ </action>
+ 
+ <value>0.0</value>
+ 
+ <axis>
+  <x>1</x>
+  <y>0</y>
+  <z>0</z>
+ </axis>
+ 
+ <center>
+     <x-m>0.0</x-m>
+     <y-m>0.0</y-m>
+     <z-m>-0.0353</z-m>
+ </center>
+ 
+ <hovered>
+  <binding>
+    <command>set-tooltip</command>
+    <tooltip-id>ai-horizon-offset</tooltip-id>
+    <label>Horizon Offset: %2d</label>
+    <property>instrumentation/attitude-indicator/horizon-offset-deg</property>
+ </binding>
+ </hovered>
+</animation>
+
 
  <animation>
   <type>pick</type>
@@ -116,6 +132,16 @@
     <value type="bool">true</value>
    </binding>          
   </action>
+  
+  <hovered>
+   <binding>
+     <command>set-tooltip</command>
+     <tooltip-id>ai-caged</tooltip-id>
+     <label>Caged: %s</label>
+      <mapping>on-off</mapping>
+     <property>instrumentation/attitude-indicator/caged-flag</property>
+  </binding>
+  </hovered>
  </animation>
 
  <animation>
diff --git a/Aircraft/c172p/Instruments/asi/asi.xml b/Aircraft/c172p/Instruments/asi/asi.xml
index 5461c326c..0894af94a 100644
--- a/Aircraft/c172p/Instruments/asi/asi.xml
+++ b/Aircraft/c172p/Instruments/asi/asi.xml
@@ -40,6 +40,20 @@
   </axis>
  </animation>
 
+ <animation>
+   <type>pick</type>
+   <object-name>Face</object-name>
+   <object-name>Needle</object-name>
+   <hovered>
+       <binding>
+         <command>set-tooltip</command>
+         <tooltip-id>airspeed</tooltip-id>
+         <label>Airspeed: %3dkts</label>
+         <property>instrumentation/airspeed-indicator/indicated-speed-kt</property>
+      </binding>
+   </hovered>
+ </animation>
+
 </PropertyList>
 
 
diff --git a/Aircraft/c172p/Instruments/hi/hi.xml b/Aircraft/c172p/Instruments/hi/hi.xml
index 00d593c96..0ce81c54f 100644
--- a/Aircraft/c172p/Instruments/hi/hi.xml
+++ b/Aircraft/c172p/Instruments/hi/hi.xml
@@ -65,237 +65,72 @@
 
 <!--     Heading Bug control    -->
  <animation>
-  <type>pick</type>
+  <type>knob</type>
   <object-name>click-bug-L</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small decrease</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>large decrease</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>-5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
- </animation>
-
- <animation>
-  <type>pick</type>
   <object-name>click-bug-R</object-name>
   <visible>false</visible>
+  
   <action>
-    <name>small increase</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
     <binding>
       <command>property-adjust</command>
       <property>autopilot/settings/heading-bug-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>large increase</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>autopilot/settings/heading-bug-deg</property>
-      <step>1</step>
+      <factor>1</factor>
       <min>0</min>
       <max>360</max>
       <wrap>1</wrap>
     </binding>
   </action>
+  
+  <!-- faster rate of change than the default -->
+  <drag-scale-px>4</drag-scale-px>
+  <shift-repeat type="int">5</shift-repeat>
+  
+  <hovered>
+   <binding>
+     <command>set-tooltip</command>
+     <tooltip-id>heading-bug</tooltip-id>
+     <mapping>heading</mapping>
+     <label>Heading Bug: %3d</label>
+     <property>autopilot/settings/heading-bug-deg</property>
+  </binding>
+  </hovered>
  </animation>
 
    <!--             Heading Offset             -->
- <animation>
-  <type>pick</type>
-  <object-name>click-offset-L</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small decrease</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
+   
+   <animation>
+    <type>knob</type>
+    <object-name>click-offset-L</object-name>
+    <object-name>click-offset-R</object-name>
+    <visible>false</visible>
+  
+    <action>
+      <binding>
+        <command>property-adjust</command>
+        <property>instrumentation/heading-indicator/offset-deg</property>
+        <factor>1</factor>
+        <min>0</min>
+        <max>360</max>
+        <wrap>1</wrap>
+      </binding>
+    </action>
+  
+    <!-- faster rate of change than the default -->
+    <drag-scale-px>4</drag-scale-px>
+    <shift-repeat type="int">5</shift-repeat>
+    
+    <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>heading-offset</tooltip-id>
+       <label>Heading Offset: %3d</label>
+       <mapping>heading</mapping>
+       <property>instrumentation/heading-indicator/offset-deg</property>
     </binding>
-  </action>  
-  <action>
-    <name>large decrease</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>-5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
- </animation>
+    </hovered>
+   </animation>
+   
 
- <animation>
-  <type>pick</type>
-  <object-name>click-offset-R</object-name>
-  <visible>false</visible>
-  <action>
-    <name>small increase</name>
-    <button>0</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>  
-  <action>
-    <name>large increase</name>
-    <button>1</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>5</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small decrease (scrollwheel)</name>
-    <button>3</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>-1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-  <action>
-    <name>small increase (scrollwheel)</name>
-    <button>4</button>
-    <repeatable>true</repeatable>
-    <binding>
-      <command>property-adjust</command>
-      <property>instrumentation/heading-indicator/offset-deg</property>
-      <step>1</step>
-      <min>0</min>
-      <max>360</max>
-      <wrap>1</wrap>
-    </binding>
-  </action>
-</animation>
 
 </PropertyList>
 
diff --git a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
index 1f42c9efd..c51f9ecc6 100644
--- a/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
+++ b/Aircraft/c172p/Instruments/kap140/KAP140TwoAxisAlt.xml
@@ -652,6 +652,13 @@ properties' values.
      </script>
       </binding>
     </action>
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>kap140-ap-btn</tooltip-id>
+        <label>Autopilot Arm/Disarm</label>
+      </binding>
+    </hovered>
   </animation>
   <animation>
     <type>pick</type>
@@ -788,86 +795,39 @@ properties' values.
       </mod-up>
     </action>
   </animation>
+  
   <animation>
-    <type>pick</type>
-    <object-name>knob-inner</object-name>
-    <action>
-      <name>Knob small down</name>
-      <button>3</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobSmallDown();</script>
-      </binding>
-    </action>
-    <action>
-      <name>Knob small up</name>
-      <button>4</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobSmallUp();</script>
-      </binding>
-    </action>
-  </animation>
-  <animation>
-    <type>pick</type>
-    <object-name>knob-outer</object-name>
-    <action>
-      <name>Knob large down</name>
-      <button>3</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobLargeDown();</script>
-      </binding>
-    </action>
-    <action>
-      <name>Knob large up</name>
-      <button>4</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobLargeUp();</script>
-      </binding>
-    </action>
-  </animation>
+      <object-name>knob-inner</object-name>
+      <object-name>knob-outer</object-name>
+      <type>knob</type>
+      <increase>
+          <binding>
+            <command>nasal</command>
+            <script>kap140.knobSmallUp();</script>
+          </binding>
+      </increase>
+      <decrease>
+          <binding>
+            <command>nasal</command>
+            <script>kap140.knobSmallDown();</script>
+          </binding>
+      </decrease>
+      
+      <shift-increase>
+          <binding>
+            <command>nasal</command>
+            <script>kap140.knobLargeUp();</script>
+          </binding>
+      </shift-increase>
+      <shift-decrease>
+          <binding>
+            <command>nasal</command>
+            <script>kap140.knobLargeDown();</script>
+          </binding>
+      </shift-decrease>
+ </animation>
+  
 
-  <animation>
-    <type>pick</type>
-    <object-name>knob-left</object-name>
-    <action>
-      <name>Knob small down</name>
-      <button>0</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobSmallDown();</script>
-      </binding>
-    </action>
-    <action>
-      <name>Knob large down</name>
-      <button>1</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobLargeDown();</script>
-      </binding>
-    </action>
-  </animation>
-  <animation>
-    <type>pick</type>
-    <object-name>knob-right</object-name>
-    <action>
-      <name>Knob small up</name>
-      <button>0</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobSmallUp();</script>
-      </binding>
-    </action>
-    <action>
-      <name>Knob large up</name>
-      <button>1</button>
-      <binding>
-        <command>nasal</command>
-        <script>kap140.knobLargeUp();</script>
-      </binding>
-    </action>
-  </animation>
 
+ 
 </PropertyList>
diff --git a/Aircraft/c172p/Instruments/kma20/kma20.xml b/Aircraft/c172p/Instruments/kma20/kma20.xml
index 713645015..b8286daf7 100644
--- a/Aircraft/c172p/Instruments/kma20/kma20.xml
+++ b/Aircraft/c172p/Instruments/kma20/kma20.xml
@@ -113,8 +113,14 @@
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <object-name>AUTO</object-name>
+    
+    <proxy-name>AUTOUp</proxy-name>
+    <proxy-name>AUTODown</proxy-name>
+    
     <property alias="../../params/auto"/>
     <factor>30</factor>
     <axis>
@@ -124,47 +130,39 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>AUTOUp</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/auto"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>AUTODown</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-auto</tooltip-id>
+        <label>Auto: %s</label>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
         <property alias="../../../../params/auto"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
       </binding>
-    </action>
+    </hovered>
+    
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>COM1</object-name>
+    <proxy-name>COM1Up</proxy-name>
+    <proxy-name>COM1Down</proxy-name>
+    
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <property alias="../../params/com1"/>
     <factor>30</factor>
     <axis>
@@ -174,47 +172,38 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>COM1Up</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/com1"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>COM1Down</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-com1</tooltip-id>
         <property alias="../../../../params/com1"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <label>COM1: %s</label>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
+
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>COM2</object-name>
+    <proxy-name>COM2Up</proxy-name>
+    <proxy-name>COM2Down</proxy-name>
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <property alias="../../params/com2"/>
     <factor>30</factor>
     <axis>
@@ -224,47 +213,38 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>COM2Up</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/com2"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>COM2Down</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-com2</tooltip-id>
+        <label>COM2: %s</label>
         <property alias="../../../../params/com2"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>NAV1</object-name>
+    <proxy-name>NAV1Up</proxy-name>
+    <proxy-name>NAV1Down</proxy-name>
+    
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <property alias="../../params/nav1"/>
     <factor>30</factor>
     <axis>
@@ -274,47 +254,39 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>NAV1Up</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/nav1"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>NAV1Down</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-nav1</tooltip-id>
+        <label>NAV1: %s</label>
         <property alias="../../../../params/nav1"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
+
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>NAV2</object-name>
+    <proxy-name>NAV2Up</proxy-name>
+    <proxy-name>NAV2Down</proxy-name>
+    
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <property alias="../../params/nav2"/>
     <factor>30</factor>
     <axis>
@@ -324,47 +296,38 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>NAV2Up</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/nav2"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>NAV2Down</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-nav2</tooltip-id>
+        <label>NAV2: %s</label>
         <property alias="../../../../params/nav2"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>ADF</object-name>
+    <proxy-name>ADFUp</proxy-name>
+    <proxy-name>ADFDown</proxy-name>
+    
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
     <property alias="../../params/adf"/>
     <factor>30</factor>
     <axis>
@@ -374,47 +337,38 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>ADFUp</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/adf"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>ADFDown</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-adf</tooltip-id>
+        <label>ADF: %s</label>
         <property alias="../../../../params/adf"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>DME</object-name>
+    <proxy-name>DMEUp</proxy-name>
+    <proxy-name>DMEDown</proxy-name>
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
+    
     <property alias="../../params/dme"/>
     <factor>30</factor>
     <axis>
@@ -424,47 +378,38 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>DMEUp</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/dme"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>DMEDown</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-dme</tooltip-id>
+        <label>DME: %s</label>
         <property alias="../../../../params/dme"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>MKR</object-name>
+    <proxy-name>MKRUp</proxy-name>
+    <proxy-name>MKRDown</proxy-name>
+    <drag-direction>vertical</drag-direction>
+    <drag-scale-px>30</drag-scale-px>
+    
     <property alias="../../params/mkr"/>
     <factor>30</factor>
     <axis>
@@ -474,42 +419,28 @@
       <x-m>0.0131629</x-m>
       <z-m>0.00714385</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>MKRUp</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/mkr"/>
-        <step>-1</step>
+        <factor>-1</factor>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>MKRDown</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
+    
+    <hovered>
       <binding>
-        <command>property-adjust</command>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-mkr</tooltip-id>
+        <label>Marker Beacon: %s</label>
         <property alias="../../../../params/mkr"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "SPEAKER" : (arg[0]==1) ? "HEADSET" : "OFF"</script>
       </binding>
-    </action>
+    </hovered>
   </animation>
 
   <animation>
@@ -598,8 +529,11 @@
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>knob</type>
     <object-name>Knob</object-name>
+    <proxy-name>MICLeft</proxy-name>
+    <proxy-name>MICRight</proxy-name>
+    
     <property alias="../../params/knob"/>
     <factor>-30</factor>
     <axis>
@@ -609,42 +543,29 @@
       <y-m>-0.0605381</y-m>
       <z-m>0.00559147</z-m>
     </center>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>MICLeft</object-name>
-    <visible>false</visible>
+    
     <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
       <binding>
         <command>property-adjust</command>
         <property alias="../../../../params/knob"/>
-        <step>-1</step>
         <min>-1</min>
         <max>1</max>
         <wrap>0</wrap>
       </binding>
     </action>
+    
+    <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <tooltip-id>kma20-mic</tooltip-id>
+        <label>Microphone: %s</label>
+        <property alias="../../../../params/knob"/>
+        <mapping>nasal</mapping>
+        <script>(arg[0] == -1) ? "COM1" : (arg[0]==1) ? "External" : "COM2"</script>
+      </binding>
+    </hovered>
+    
   </animation>
 
-  <animation>
-    <type>pick</type>
-    <object-name>MICRight</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>false</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/knob"/>
-        <step>1</step>
-        <min>-1</min>
-        <max>1</max>
-        <wrap>0</wrap>
-      </binding>
-    </action>
-  </animation>
 
 </PropertyList>
diff --git a/Aircraft/c172p/Instruments/kr87-adf/ki227_228.xml b/Aircraft/c172p/Instruments/kr87-adf/ki227_228.xml
index f95862810..4cdf0ae67 100644
--- a/Aircraft/c172p/Instruments/kr87-adf/ki227_228.xml
+++ b/Aircraft/c172p/Instruments/kr87-adf/ki227_228.xml
@@ -115,8 +115,17 @@
   </animation>
 
   <animation>
-    <type>rotate</type>
+    <type>pick</type>
+    <object-name>HDGSelectorPick.L</object-name>
+    <object-name>HDGSelectorPick.R</object-name>
+    <visible>false</visible>
+  </animation>
+    
+
+  <animation>
+    <type>knob</type>
     <object-name>HDGSelector</object-name>
+
     <property alias="../../params/rotation-deg"/>
     <factor>8.0</factor>
     <axis>
@@ -129,96 +138,27 @@
       <y-m>-0.0318072</y-m>
       <z-m>-0.0327009</z-m>
     </center>
+    
+    <action>
+      <binding>
+        <command>property-adjust</command>
+        <property alias="../../../../params/rotation-deg"/>
+        <factor>1</factor>
+        <min>0</min>
+        <max>360</max>
+        <wrap>1</wrap>
+      </binding>
+    </action>
+
+    <hovered>
+     <binding>
+       <command>set-tooltip</command>
+       <tooltip-id>adf-hdg</tooltip-id>
+       <label>ADF Heading: %3d</label>
+       <property alias="../../../../params/rotation-deg"/>
+    </binding>
+    </hovered>
   </animation>
 
-  <animation>
-    <type>pick</type>
-    <object-name>HDGSelectorPick.L</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>-1</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-    <action>
-      <button>1</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>-10</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>HDGSelectorPick.R</object-name>
-    <visible>false</visible>
-    <action>
-      <button>0</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>1</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-    <action>
-      <button>1</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>10</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-  </animation>
-
-  <animation>
-    <type>pick</type>
-    <object-name>HDGSelector</object-name>
-    <visible>true</visible>
-    <action>
-      <button>3</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>-1</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-    <action>
-      <button>4</button>
-      <repeatable>true</repeatable>
-      <binding>
-        <command>property-adjust</command>
-        <property alias="../../../../params/rotation-deg"/>
-        <step>1</step>
-        <min>0</min>
-        <max>360</max>
-        <wrap>1</wrap>
-      </binding>
-    </action>
-  </animation>
 
 </PropertyList>
diff --git a/Aircraft/c172p/Instruments/kr87-adf/kr87.xml b/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
index 811eb9229..d1abd77fe 100644
--- a/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
+++ b/Aircraft/c172p/Instruments/kr87-adf/kr87.xml
@@ -443,8 +443,16 @@
     </animation>
 
     <animation>
-        <type>rotate</type>
+        <type>pick</type>
+        <object-name>VolumePickLeft</object-name>
+        <object-name>VolumePickRight</object-name>
+        <visible>false</visible>
+    </animation>
+        
+    <animation>
+        <type>knob</type>
         <object-name>Volume</object-name>
+        
         <property>/instrumentation/adf[0]/volume-norm</property>
         <factor>-270</factor>
         <axis>
@@ -457,21 +465,17 @@
             <y-m>0.03362955</y-m>
             <z-m>-0.00472295</z-m>
         </center>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <visible>false</visible>
-        <object-name>VolumePickRight</object-name>
+        
         <action>
-            <button>0</button>
             <binding>
                 <command>property-adjust</command>
                 <property>/instrumentation/adf[0]/volume-norm</property>
-                <step>0.1</step>
+                <factor>0.1</factor>
                 <min>0</min>
                 <max>1.0</max>
             </binding>
+            
+            <!-- switch on if volume greater than 0.0 -->
             <binding>
                 <condition>
                     <greater-than>
@@ -483,22 +487,8 @@
                 <property>/instrumentation/adf[0]/power-btn</property>
                 <value type="bool">1</value>
             </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
-        <visible>false</visible>
-        <object-name>VolumePickLeft</object-name>
-        <action>
-            <button>0</button>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/volume-norm</property>
-                <step>-0.1</step>
-                <min>0</min>
-                <max>1.0</max>
-            </binding>
+    
+            <!-- switch off if volume less than 0.1 -->
             <binding>
                 <condition>
                     <less-than>
@@ -510,186 +500,43 @@
                 <property>/instrumentation/adf[0]/power-btn</property>
                 <value type="bool">0</value>
             </binding>
+            
         </action>
     </animation>
-
-    <animation>
-        <type>pick</type>
-        <visible>true</visible>
-        <object-name>Volume</object-name>
-        <action>
-            <button>4</button>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/volume-norm</property>
-                <step>0.1</step>
-                <min>0</min>
-                <max>1.0</max>
-            </binding>
-            <binding>
-                <condition>
-                    <greater-than>
-                        <property>/instrumentation/adf[0]/volume-norm</property>
-                        <value>0.0</value>
-                    </greater-than>
-                </condition>
-                <command>property-assign</command>
-                <property>/instrumentation/adf[0]/power-btn</property>
-                <value type="bool">1</value>
-            </binding>
-        </action>
-        <action>
-            <button>3</button>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/volume-norm</property>
-                <step>-0.1</step>
-                <min>0</min>
-                <max>1.0</max>
-            </binding>
-            <binding>
-                <condition>
-                    <less-than>
-                        <property>/instrumentation/adf[0]/volume-norm</property>
-                        <value>0.1</value>
-                    </less-than>
-                </condition>
-                <command>property-assign</command>
-                <property>/instrumentation/adf[0]/power-btn</property>
-                <value type="bool">0</value>
-            </binding>
-        </action>
-    </animation>
-
+    
+    <!-- frequency knob -->
     <animation>
         <type>pick</type>
         <object-name>FreqPickLeft</object-name>
-        <visible>false</visible>
-        <action>
-            <button>0</button>
-            <repeatable>false</repeatable>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>-1</step>
-                <min>200</min>
-                <max>1800</max>
-                <resolution>1</resolution>
-                <wrap>true</wrap>
-            </binding>
-        </action>
-        <action>
-            <button>1</button>
-            <repeatable>false</repeatable>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>-100</step>
-                <min>200</min>
-                <max>1800</max>
-                <wrap>true</wrap>
-                <mask>integer</mask>
-            </binding>
-        </action>
-    </animation>
-
-    <animation>
-        <type>pick</type>
         <object-name>FreqPickRight</object-name>
         <visible>false</visible>
-        <action>
-            <button>0</button>
-            <repeatable>false</repeatable>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>1</step>
-                <min>200</min>
-                <max>1800</max>
-                <resolution>1</resolution>
-                <wrap>true</wrap>
-            </binding>
-        </action>
-        <action>
-            <button>1</button>
-            <repeatable>false</repeatable>
-            <binding>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>100</step>
-                <min>200</min>
-                <max>1800</max>
-                <wrap>true</wrap>
-                <mask>integer</mask>
-            </binding>
-        </action>
     </animation>
-
+        
     <animation>
-        <type>pick</type>
+        <type>knob</type>
         <object-name>FRQOuter</object-name>
         <object-name>FRQInner</object-name>
-        <visible>true</visible>
         <action>
-            <button>3</button>
-            <repeatable>false</repeatable>
             <binding>
-                <condition>
-                    <property>devices/status/keyboard/shift</property>
-                </condition>
                 <command>property-adjust</command>
                 <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>-100</step>
-                <min>200</min>
-                <max>1800</max>
-                <resolution>1</resolution>
-                <wrap>true</wrap>
-            </binding>
-            <binding>
-                <condition>
-                    <not>
-                        <property>devices/status/keyboard/shift</property>
-                    </not>
-                </condition>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>-1</step>
+                <factor>1</factor>
                 <min>200</min>
                 <max>1800</max>
                 <resolution>1</resolution>
                 <wrap>true</wrap>
             </binding>
         </action>
-        <action>
-            <button>4</button>
-            <repeatable>false</repeatable>
+        <shift-action>
             <binding>
-                <condition>
-                    <not>
-                        <property>devices/status/keyboard/shift</property>
-                    </not>
-                </condition>
                 <command>property-adjust</command>
                 <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>1</step>
+                <factor>100</factor>
                 <min>200</min>
                 <max>1800</max>
+                <resolution>1</resolution>
                 <wrap>true</wrap>
-                <mask>integer</mask>
             </binding>
-            <binding>
-                <condition>
-                    <property>devices/status/keyboard/shift</property>
-                </condition>
-                <command>property-adjust</command>
-                <property>/instrumentation/adf[0]/frequencies/standby-khz</property>
-                <step>100</step>
-                <min>200</min>
-                <max>1800</max>
-                <wrap>true</wrap>
-                <mask>integer</mask>
-            </binding>
-        </action>
+        </shift-action>
     </animation>
-
 </PropertyList>
diff --git a/Aircraft/c172p/Instruments/light/light_control.xml b/Aircraft/c172p/Instruments/light/light_control.xml
index 3a6e8ab1d..c7979c82d 100644
--- a/Aircraft/c172p/Instruments/light/light_control.xml
+++ b/Aircraft/c172p/Instruments/light/light_control.xml
@@ -6,75 +6,33 @@
 
 <!--     Panel/radio light control    -->
  <animation>
-  <type>pick</type>
-  <object-name>LightHotspotLeft</object-name>
+  <type>knob</type>
+  <object-name>LightKnob</object-name>
+  <proxy-name>LightHotspotLeft</proxy-name>
+  <proxy-name>LightHotspotRight</proxy-name>
+  
   <visible>true</visible>
   <action>
-    <name>Decrease</name>
-    <button>0</button>
     <repeatable>true</repeatable>
     <binding>
       <command>property-adjust</command>
       <property>controls/lighting/instruments-norm</property>
-      <step>-0.1</step>
+      <factor>0.1</factor>
       <min>0</min>
       <max>1.0</max>
       <wrap>0</wrap>
     </binding>
   </action>
- </animation>
-
- <animation>
-   <type>pick</type>
-   <object-name>LightHotspotRight</object-name>
-   <visible>true</visible>
-   <action>
-     <name>Increase</name>
-     <button>0</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/lighting/instruments-norm</property>
-       <step>0.1</step>
-       <min>0</min>
-       <max>1.0</max>
-       <wrap>0</wrap>
-     </binding>
-   </action>
- </animation>
-
- <animation>
-   <type>pick</type>
-   <object-name>LightHotspotLeft</object-name>
-   <object-name>LightHotspotRight</object-name>
-   <object-name>LightKnob</object-name>
-   <visible>true</visible>
-   <action>
-     <name>Decrease - scrollwheel</name>
-     <button>3</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/lighting/instruments-norm</property>
-       <step>-0.1</step>
-       <min>0</min>
-       <max>1.0</max>
-       <wrap>0</wrap>
-     </binding>
-   </action>
-   <action>
-     <name>Increase - scrollwheel</name>
-     <button>4</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/lighting/instruments-norm</property>
-       <step>0.1</step>
-       <min>0</min>
-       <max>1.0</max>
-       <wrap>0</wrap>
-     </binding>
-   </action>
+  
+  <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>lighting-brightness</tooltip-id>
+      <label>Instrument Lighting: %3d%%</label>
+      <property>controls/lighting/instruments-norm</property>
+      <mapping>percent</mapping>
+    </binding>
+  </hovered>
  </animation>
 
  
diff --git a/Aircraft/c172p/Models/c172p.xml b/Aircraft/c172p/Models/c172p.xml
index 397962461..d0b774edc 100644
--- a/Aircraft/c172p/Models/c172p.xml
+++ b/Aircraft/c172p/Models/c172p.xml
@@ -1274,6 +1274,7 @@
  <animation>
    <type>pick</type>
    <object-name>doorhandleext_right</object-name>
+   <object-name>doorhandleint_right</object-name>
    <visible>true</visible>
    <action>
      <button>0</button>
@@ -1283,11 +1284,20 @@
         <script>c172p.rightDoor.toggle();</script>
      </binding>
    </action>
+   
+   <hovered>
+       <binding>
+         <command>set-tooltip</command>
+         <tooltip-id>door-handle-r</tooltip-id>
+         <label>Right Door Open/Close</label>
+    </binding>
+   </hovered>
  </animation>
 
  <animation>
    <type>pick</type>
    <object-name>doorhandleext_left</object-name>
+   <object-name>doorhandle_intle</object-name>
    <visible>true</visible>
    <action>
      <button>0</button>
@@ -1297,6 +1307,14 @@
        <script>c172p.leftDoor.toggle();</script>
      </binding>
    </action>
+   
+   <hovered>
+       <binding>
+         <command>set-tooltip</command>
+         <tooltip-id>door-handle-l</tooltip-id>
+         <label>Left Door Open/Close</label>
+    </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1311,34 +1329,14 @@
        <script>c172p.baggageDoor.toggle();</script>
      </binding>
    </action>
- </animation>
-
- <animation>
-   <type>pick</type>
-   <object-name>doorhandleint_right</object-name>
-   <visible>true</visible>
-   <action>
-     <button>0</button>
-     <repeatable>false</repeatable>
-     <binding>
-       <command>nasal</command>
-       <script>c172p.rightDoor.toggle();</script>
-     </binding>
-   </action>
- </animation>
-
- <animation>
-   <type>pick</type>
-   <object-name>doorhandle_intle</object-name>
-   <visible>true</visible>
-   <action>
-     <button>0</button>
-     <repeatable>false</repeatable>
-     <binding>
-       <command>nasal</command>
-       <script>c172p.leftDoor.toggle();</script>
-     </binding>
-   </action>
+   
+   <hovered>
+       <binding>
+         <command>set-tooltip</command>
+         <tooltip-id>door-handle-baggage</tooltip-id>
+         <label>Baggage Door Open/Close</label>
+    </binding>
+   </hovered>
  </animation>
 
 <!--door animation-->
@@ -1500,6 +1498,15 @@
        <property>controls/lighting/landing-lights</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>landing-light-switch</tooltip-id>
+      <label>Landing Lights: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/lighting/landing-lights</property>
+   </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1514,6 +1521,15 @@
        <property>controls/lighting/taxi-light</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>taxi-light-switch</tooltip-id>
+      <label>Taxi Light: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/lighting/taxi-light</property>
+   </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1528,6 +1544,15 @@
        <property>controls/lighting/strobe</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>strobe-switch</tooltip-id>
+      <label>Strobe: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/lighting/strobe</property>
+   </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1542,6 +1567,15 @@
        <property>controls/lighting/beacon</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>beacon-switch</tooltip-id>
+      <label>Beacon: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/lighting/beacon</property>
+   </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1556,6 +1590,15 @@
        <property>controls/lighting/nav-lights</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>nav-light-switch</tooltip-id>
+      <label>Navigation Lights: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/lighting/nav-lights</property>
+   </binding>
+   </hovered>
  </animation>
 
  <animation>
@@ -1570,6 +1613,15 @@
        <property>controls/anti-ice/pitot-heat</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <tooltip-id>pitot-heat</tooltip-id>
+      <label>Pitot Heat: %s</label>
+      <mapping>on-off</mapping>
+      <property>controls/anti-ice/pitot-heat</property>
+   </binding>
+   </hovered>
  </animation>
 
  <!-- Parking Brake -->
@@ -1614,6 +1666,15 @@
        <property>/controls/gear/brake-parking</property>
      </binding>
    </action>
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <label>Parking brake: %s</label>
+      <property>/controls/gear/brake-parking</property>
+      <tooltip-id>parking-brake</tooltip-id>
+      <mapping>on-off</mapping>
+   </binding>
+   </hovered>
  </animation>
 
  <!-- Carb Heat -->
@@ -1656,36 +1717,36 @@
  </animation>
 
  <animation>
-   <type>pick</type>
+   <type>slider</type>
    <object-name>Throttle</object-name>
    <object-name>ThrottleMount</object-name>
    <visible>true</visible>
+   
+   <drag-direction>vertical</drag-direction>
+   <!-- no translation, we handle that seperately -->
+   
    <action>
-     <name>small increase (scrollwheel)</name>
-     <button>3</button>
-     <repeatable>true</repeatable>
      <binding>
        <command>property-adjust</command>
        <property>controls/engines/engine[0]/throttle</property>
-       <step>0.05</step>
+       <factor>0.05</factor>
        <min>0</min>
        <max>1</max>
        <wrap>0</wrap>
      </binding>
    </action>
-   <action>
-     <name>small decrease (scrollwheel)</name>
-     <button>4</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/engines/engine[0]/throttle</property>
-       <step>-0.05</step>
-       <min>0</min>
-       <max>1</max>
-       <wrap>0</wrap>
+   
+     <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <label>Throttle: %3d%%</label>
+        <measure-text>Throttle: 100%</measure-text>
+        <tooltip-id>throttle</tooltip-id>
+        <mapping>percent</mapping>
+        <property>controls/engines/engine[0]/throttle</property>
      </binding>
-   </action>
+     
+     </hovered>
  </animation>
 
  <animation>
@@ -1701,44 +1762,46 @@
  </animation>
 
  <animation>
-   <type>pick</type>
+   <type>slider</type>
    <object-name>Mixture</object-name>
    <object-name>MixtureMount</object-name>
    <visible>true</visible>
+   
+   <!-- no translation, we handle that seperately -->
+   <drag-direction>vertical</drag-direction>
+   
    <action>
-     <name>small increase (scrollwheel)</name>
-     <button>3</button>
-     <repeatable>true</repeatable>
      <binding>
        <command>property-adjust</command>
        <property>controls/engines/engine[0]/mixture</property>
-       <step>0.05</step>
+       <factor>0.05</factor>
        <min>0</min>
        <max>1</max>
        <wrap>0</wrap>
      </binding>
    </action>
-   <action>
-     <name>small decrease (scrollwheel)</name>
-     <button>4</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/engines/engine[0]/mixture</property>
-       <step>-0.05</step>
-       <min>0</min>
-       <max>1</max>
-       <wrap>0</wrap>
+   
+     <hovered>
+      <binding>
+        <command>set-tooltip</command>
+        <label>Mixture: %3d%%</label>
+        <measure-text>Mixture: 100%</measure-text>
+        <tooltip-id>mixture</tooltip-id>
+        <mapping>percent</mapping>
+        <property>controls/engines/engine[0]/mixture</property>
      </binding>
-   </action>
+     </hovered>
+
  </animation>
 
  <!-- Elevator Trim -->
  <animation>
-   <type>rotate</type>
+   <type>knob</type>
    <object-name>TrimWheel</object-name>
    <property>controls/flight/elevator-trim</property>
    <factor>-360</factor>
+   <drag-direction>vertical</drag-direction>
+   
    <axis>
      <x>0.0</x>
      <y>1.0</y>
@@ -1749,38 +1812,28 @@
      <y-m>-0.20</y-m>
      <z-m>-0.48</z-m>
    </center>
+   
+   <action>
+     <binding>
+       <command>property-adjust</command>
+       <property>controls/flight/elevator-trim</property>
+       <factor>0.01</factor>
+       <min>-1</min>
+       <max>1</max>
+       <wrap>0</wrap>
+     </binding>
+   </action>
+   
+   <hovered>
+    <binding>
+      <command>set-tooltip</command>
+      <label>Elevator trim: %3f</label>
+      <tooltip-id>pitch-trim</tooltip-id>
+      <property>controls/flight/elevator-trim</property>
+   </binding>
+   </hovered>
  </animation>
 
- <animation>
-   <type>pick</type>
-   <object-name>TrimWheel</object-name>
-   <visible>true</visible>
-   <action>
-     <name>Increase (scrollwheel)</name>
-     <button>3</button>
-     <repeatable>true</repeatable>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/flight/elevator-trim</property>
-       <step>0.01</step>
-       <min>-1</min>
-       <max>1</max>
-       <wrap>0</wrap>
-     </binding>
-   </action>
-   <action>
-     <name>Decrease (scrollwheel)</name>
-     <button>4</button>
-     <binding>
-       <command>property-adjust</command>
-       <property>controls/flight/elevator-trim</property>
-       <step>-0.01</step>
-       <min>-1</min>
-       <max>1</max>
-       <wrap>0</wrap>
-     </binding>
-   </action>
- </animation>
 
  <animation>
    <type>rotate</type>
diff --git a/Nasal/canvas/tooltip.nas b/Nasal/canvas/tooltip.nas
index f24c7ee75..f4d814b93 100644
--- a/Nasal/canvas/tooltip.nas
+++ b/Nasal/canvas/tooltip.nas
@@ -9,13 +9,15 @@ var Tooltip = {
       _listener: nil,
       _property: nil,
       _mapping: "",
+      _mappingFunc: nil,
       _width: 0,
       _height: 0,
       _tipId: nil,
       _slice: 17,
       _measureText: nil,
       _measureBB: nil,
-      _hideTimer: nil
+      _hideTimer: nil,
+      _hiding: nil
     };
     
     m.setInt("size[0]", size[0]);
@@ -151,26 +153,37 @@ var Tooltip = {
   {
     if (me._mapping == "") return val;
     if (me._mapping == "percent") return int(val * 100);
+    
     # TODO - translate me!
     if (me._mapping == "on-off") return (val == 1) ? "ON" : "OFF";
     if (me._mapping == "arm-disarm") return (val == 1) ? "ARMED" : "DISARMED";
+    
     # provide both 'senses' of the flag here
     if (me._mapping == "up-down") return (val == 1) ? "UP" : "DOWN";
-    if (me._mapping == "down-up") return (val == 1) ? "DOWN" : "UP";
+    if (me._mapping == "down-up") return (val == 1) ? "DOWN" : "UP";    
+    if (me._mapping == "open-close") return (val == 1) ? "OPEN" : "CLOSED";
+    if (me._mapping == "close-open") return (val == 1) ? "CLOSED" : "OPEN";
+    
     if (me._mapping == "heading") return geo.normdeg(val);
+    if (me._mapping == "nasal") return me._mappingFunc(val);
 
     return val;
   },
 
-  setMapping: func(mapping)
+  setMapping: func(mapping, f = nil)
   {
     me._mapping = mapping;
+    me._mappingFunc = f;
     me._updateText();
   },
 
   setTooltipId: func(tipId)
   {
     me._tipId = tipId;
+    if ((tipId != nil) and me._hiding) {
+      me._hideTimer.stop();
+      me._hiding = 0;
+    }
   },
 
   getTooltipId: func { me._tipId; },
@@ -191,7 +204,15 @@ var Tooltip = {
   {
     # don't show if undefined
     if (me._tipId == nil) return;
-    me.setBool("visible", 1);
+    
+    if (me._hiding) {
+      me._hideTimer.stop();
+      me._hiding = 0;
+    }
+    
+    if (!me.isVisible()) {
+      me.setBool("visible", 1); 
+    }
   },
 
   showMessage: func()
@@ -205,7 +226,11 @@ var Tooltip = {
 
   hide: func()
   {
-    me._hideTimer.restart(1.0);
+    # this gets run repeatedly during mouse-moves
+    if (me._hiding) return;
+    me._hiding = 1;
+    
+    me._hideTimer.restart(0.5);
   },
 
   hideNow: func()
@@ -233,6 +258,7 @@ var Tooltip = {
   _hideTimeout: func()
   {
     me.setBool("visible", 0);
+    me._hiding = 0;
   }
 };
 
@@ -249,17 +275,24 @@ var innerSetTooltip = func(node)
        tooltip.setWidthText(nil);
    }
 
-   var nodePath = cmdarg().getNode('property');
-   if (nodePath != nil) {
-     var n = props.globals.getNode(nodePath.getValue());
+   var propPath = cmdarg().getNode('property');
+   if (propPath != nil) {
+     var n = props.globals.getNode(propPath.getValue());
      tooltip.setProperty(n);
-
-     # mapping modes allow some standard conversion of the property
-     # value to a human readable form.
-     var mapping = cmdarg().getNode('mapping');
-     tooltip.setMapping(mapping == nil ? "" : mapping.getValue());
    } else {
-     tooltip.setProperty(nil);
+      tooltip.setProperty(nil);
+   }
+
+   var mapping = cmdarg().getNode('mapping');
+   if (mapping != nil) {
+     var m = mapping.getValue();
+     var f = nil;
+     if (m == 'nasal') {
+       f = compile(cmdarg().getNode('script').getValue());
+     }
+     
+     tooltip.setMapping(m, f);
+   } else {
      tooltip.setMapping(nil);
   }
 }
@@ -274,11 +307,10 @@ var setTooltip = func(node)
   var x = cmdarg().getNode('x').getValue();
   var y = cmdarg().getNode('y').getValue();
 
-   var screenHeight = getprop('/sim/startup/ysize');
-   tooltip.setPosition(x, screenHeight - y);
-   tooltip.setTooltipId(tipId);
-
-   innerSetTooltip(node);
+  var screenHeight = getprop('/sim/startup/ysize');
+  tooltip.setPosition(x, screenHeight - y);
+  tooltip.setTooltipId(tipId);
+  innerSetTooltip(node);
 
   # don't actually show here, we do that response to tooltip-timeout
   # so this is just getting ready
@@ -326,4 +358,4 @@ addcommand("update-hover", updateHover);
 addcommand("set-tooltip", setTooltip);
 addcommand("tooltip-timeout", showTooltip);
 addcommand("show-message", showMessage);
-addcommand("clear-message", clearMessage);
\ No newline at end of file
+addcommand("clear-message", clearMessage);