diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
index f0303e2..ccd8baa 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/AftFootPedestal.xml
@@ -1463,7 +1463,7 @@
     </UseTemplate>
     <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Button_Template">
-      <TOOLTIPID>Manual Gear Extend</TOOLTIPID>
+      <TOOLTIPID>Manual Gear Extend Lever (%((L:MD11_PED_MAN_GEAR_LVR))%{if}Extended%{else}Retracted%{end})</TOOLTIPID>
       <NODE_ID>MD11_PED_MAN_GEAR_LVR</NODE_ID>
       <ANIM_NAME>MD11_PED_MAN_GEAR_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
@@ -1531,7 +1531,7 @@
     </UseTemplate>
     <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Switch_SingleEvent_Template">
-      <TOOLTIPID>ADG Deploy Lever</TOOLTIPID>
+      <TOOLTIPID>ADG Deploy Lever (%((L:MD11_PED_ADG_LVR))%{if}Deployed%{else}Stowed%{end})</TOOLTIPID>
       <NODE_ID>MD11_PED_ADG_LVR</NODE_ID>
       <ANIM_NAME>MD11_PED_ADG_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainAux_Light.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainAux_Light.xml
index e480bfb..1ca0d8e 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainAux_Light.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainAux_Light.xml
@@ -134,7 +134,9 @@
       <LEFT_BUTTON_DOWN>94235</LEFT_BUTTON_DOWN>
       <LEFT_BUTTON_UP>94236</LEFT_BUTTON_UP>
     </UseTemplate>
+    <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Button_Template">
+      <TOOLTIPID>Left Window Crank</TOOLTIPID>
       <NODE_ID>MD11_LSIDE_WINDOW</NODE_ID>
       <ANIM_LAG>12</ANIM_LAG>
       <ANIM_NAME>MD11_LSIDE_WINDOW</ANIM_NAME>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainInstrument.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainInstrument.xml
index 8a32853..a960e62 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainInstrument.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/CaptainInstrument.xml
@@ -30,7 +30,9 @@
       <ANIM_LAG>0</ANIM_LAG>
       <ANIM_SCALAR>1</ANIM_SCALAR>
     </UseTemplate>
+    <!-- NOTE: EXP - Tooltip, manually added -->
     <UseTemplate Name="TFDi_Design_MD11_Clickspot">
+      <TOOLTIPID>Hide/Show EFB</TOOLTIPID>
       <NODE_ID>MD11_EFB_TOGGLE</NODE_ID>
       <LEFT_BUTTON_DOWN>94465</LEFT_BUTTON_DOWN>
     </UseTemplate>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOAux_Light.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOAux_Light.xml
index 65e24b3..88879c5 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOAux_Light.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOAux_Light.xml
@@ -134,7 +134,9 @@
       <LEFT_BUTTON_DOWN>95515</LEFT_BUTTON_DOWN>
       <LEFT_BUTTON_UP>95516</LEFT_BUTTON_UP>
     </UseTemplate>
+    <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Button_Template">
+      <TOOLTIPID>Right Window Crank</TOOLTIPID>
       <NODE_ID>MD11_RSIDE_WINDOW</NODE_ID>
       <ANIM_LAG>12</ANIM_LAG>
       <ANIM_NAME>MD11_RSIDE_WINDOW</ANIM_NAME>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOInstrument.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOInstrument.xml
index f883118..a0f989a 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOInstrument.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FOInstrument.xml
@@ -14,7 +14,9 @@
       <NUM_STATES>1</NUM_STATES>
       <LEFT_BUTTON_DOWN>95744</LEFT_BUTTON_DOWN>
     </UseTemplate>
+    <!-- NOTE: EXP - Tooltip, manually added -->
     <UseTemplate Name="TFDi_Design_MD11_Clickspot">
+      <TOOLTIPID>Hide/Show EFB</TOOLTIPID>
       <NODE_ID>MD11_EFB_TOGGLE_FO</NODE_ID>
       <LEFT_BUTTON_DOWN>94465</LEFT_BUTTON_DOWN>
     </UseTemplate>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FootPedestalLower.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FootPedestalLower.xml
index 02e0d77..0e2e38b 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FootPedestalLower.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/FootPedestalLower.xml
@@ -157,7 +157,7 @@
     </UseTemplate>
     <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Switch_SingleEvent_Template">
-      <TOOLTIPID>Parking Brake (%((L:MD11_THR_PARK_LVR)%{if}Engaged%{else}Disengaged%{end})</TOOLTIPID>
+      <TOOLTIPID>Parking Brake (%((L:MD11_THR_PARK_LVR))%{if}Engaged%{else}Disengaged%{end})</TOOLTIPID>
       <NODE_ID>MD11_THR_PARK_LVR</NODE_ID>
       <ANIM_NAME>MD11_THR_PARK_LVR</ANIM_NAME>
       <ANIM_LENGTH>10</ANIM_LENGTH>
diff --git a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
index 7d95b7a..81ef58b 100644
--- a/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
+++ b/PackageSources/ModelBehaviorDefs/TFDi_Design/MD11/FlightDeck/RObserverLowerMaintenance.xml
@@ -3,7 +3,7 @@
   <Template Name="TFDi_Design_MD11_RObserverLowerMaintenance">
     <!-- NOTE: EXP - Tooltip -->
     <UseTemplate Name="TFDi_Design_MD11_Knob_Template">
-      <TOOLTIPID>Circuit Breaker Integral Light (%((L:MD11_OBS_CKTBKR_LT_KB) 10 *)%!d!%%)</TOOLTIPID>
+      <TOOLTIPID>Circuit Breaker Panel Light (%((L:MD11_OBS_CKTBKR_LT_KB) 10 *)%!d!%%)</TOOLTIPID>
       <NODE_ID>MD11_OBS_CKTBKR_LT_KB</NODE_ID>
       <ANIM_NAME>MD11_OBS_CKTBKR_LT_KB</ANIM_NAME>
       <ANIM_CODE>(L:MD11_OBS_CKTBKR_LT_KB)</ANIM_CODE>
diff --git a/scripts/tooltips.csv b/scripts/tooltips.csv
index 85f9c10..0a60281 100644
--- a/scripts/tooltips.csv
+++ b/scripts/tooltips.csv
@@ -168,12 +168,12 @@ AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_CMCDU_LSK_5R_BT||Skipp
 AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_CMCDU_LSK_6L_BT||Skipped
 AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_CMCDU_LSK_6R_BT||Skipped
 AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_FLIGHTDECK_DOOR||Skipped
-AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_PED_MAN_GEAR_LVR|Manual Gear Extend|
+AftFootPedestal.xml|TFDi_Design_MD11_Button_Template|MD11_PED_MAN_GEAR_LVR|Manual Gear Extend Lever (%((L:MD11_PED_MAN_GEAR_LVR))%{if}Extended%{else}Retracted%{end})|
 AftFootPedestal.xml|TFDi_Design_MD11_Switch_Template|MD11_PED_CPT_AUDIO_PNL_INT_RADIO_SW|Captain Interphone/Radio Override|
 AftFootPedestal.xml|TFDi_Design_MD11_Switch_Template|MD11_PED_FO_AUDIO_PNL_INT_RADIO_SW|First Officer Interphone/Radio Override|
 AftFootPedestal.xml|TFDi_Design_MD11_3Pos_Knob_Hold|MD11_PED_RUD_TRIM_SW|Rudder Trim (%((L:MD11_PED_RUD_TRIM_IND) 25 - abs 0.1 &lt;)%{if}Neutral%{else}%((L:MD11_PED_RUD_TRIM_IND) 25 &lt;)%{if}%(25 (L:MD11_PED_RUD_TRIM_IND) - 2.5 /)%!1.1f!° Nose Left%{else}%((L:MD11_PED_RUD_TRIM_IND) 25 - 2.5 /)%!1.1f!° Nose Right%{end}%{end})|
 AftFootPedestal.xml|TFDi_Design_MD11_Switch_Template|MD11_PED_XPNDR_ABV_BLW_SW|TCAS Filter (%((L:MD11_PED_XPNDR_ABV_BLW_SW))%{case}%{:0}Above%{:1}Normal%{:2}Below%{end})|
-AftFootPedestal.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_PED_ADG_LVR|ADG Deploy Lever|
+AftFootPedestal.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_PED_ADG_LVR|ADG Deploy Lever (%((L:MD11_PED_ADG_LVR))%{if}Deployed%{else}Stowed%{end})|
 AftFootPedestal.xml|TFDi_Design_MD11_Knob_Template|MD11_PED_CPT_OUTER_RADIO_FREQ_SEL_KB|Captain MHz Tuner|
 AftFootPedestal.xml|TFDi_Design_MD11_Knob_Template|MD11_PED_CPT_INNER_RADIO_FREQ_SEL_KB|Captain KHz Tuner|
 AftFootPedestal.xml|TFDi_Design_MD11_Knob_Template|MD11_PED_FO_OUTER_RADIO_FREQ_SEL_KB|First Officer MHz Tuner|
@@ -380,7 +380,7 @@ CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_INP_VOR_BT|Capt
 CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_INP_APPR_BT|Captain ILS Source (%((L:MD11_LSIDE_INP_APPR_BT))%{if}System 2%{else}System 1%{end})|
 CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_OXY_FLOW_SW|Captain Oxygen Flow Regulator (%((L:MD11_LSIDE_OXY_FLOW_SW))%{if}100%%%{else}Normal%{end})|
 CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_OXY_TEST_BT|Captain Oxygen Test|
-CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_WINDOW||Skipped
+CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_LSIDE_WINDOW|Left Window|
 CaptainAux_Light.xml|TFDi_Design_MD11_Button_Template|l_window_shade_pull||Skipped
 CaptainAux_Light.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_LSIDE_TIMER_SW|Captain Timer Mode (%((L:MD11_LSIDE_TIMER_SW))%{if}Up%{else}Down%{end})|
 CaptainAux_Light.xml|TFDi_Design_MD11_Switch_Template|MD11_LSIDE_FLOOR_SW|Captain Floor Light (%((L:MD11_LSIDE_FLOOR_SW))%{case}%{:0}Off%{:1}Dim%{:2}Bright%{end})|
@@ -410,7 +410,7 @@ FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_INP_VOR_BT|First Off
 FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_INP_APPR_BT|First Officer ILS Source (%((L:MD11_RSIDE_INP_APPR_BT))%{if}System 1%{else}System 2%{end})|
 FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_OXY_FLOW_SW|First Officer Oxygen Flow Regulator (%((L:MD11_RSIDE_OXY_FLOW_SW))%{if}100%%%{else}Normal%{end})|
 FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_OXY_TEST_BT|First Officer Oxygen Test|
-FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_WINDOW||Skipped
+FOAux_Light.xml|TFDi_Design_MD11_Button_Template|MD11_RSIDE_WINDOW|Right Window|
 FOAux_Light.xml|TFDi_Design_MD11_Button_Template|Mirror_l_window_shade_pull||Skipped
 FOAux_Light.xml|TFDi_Design_MD11_Switch_Template|MD11_RSIDE_TIMER_SW|First Officer Timer Mode (%((L:MD11_RSIDE_TIMER_SW))%{if}Up%{else}Down%{end})|
 FOAux_Light.xml|TFDi_Design_MD11_Switch_Template|MD11_RSIDE_FLOOR_SW|First Officer Floor Light (%((L:MD11_RSIDE_FLOOR_SW))%{case}%{:0}Off%{:1}Dim%{:2}Bright%{end})|
@@ -429,7 +429,7 @@ FootPedestalLower.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_THR_L_ST
 FootPedestalLower.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_THR_C_START_SW|Engine 2 Starter (%((L:MD11_THR_C_START_SW))%{if}Engaged%{else}Disengaged%{end})|
 FootPedestalLower.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_THR_R_START_SW|Engine 3 Starter (%((L:MD11_THR_R_START_SW))%{if}Engaged%{else}Disengaged%{end})|
 FootPedestalLower.xml|MD11_Long_Trim_Switch|MD11_THR_LONG_TRIM_SW|Elevator Trim (Long Trim)|
-FootPedestalLower.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_THR_PARK_LVR|Parking Brake (%((L:MD11_THR_PARK_LVR)%{if}Engaged%{else}Disengaged%{end})|
+FootPedestalLower.xml|TFDi_Design_MD11_Switch_SingleEvent_Template|MD11_THR_PARK_LVR|Parking Brake (%((L:MD11_THR_PARK_LVR))%{if}Engaged%{else}Disengaged%{end})|
 FootPedestalLower.xml|MD11_Flap_Lever|MD11_FLAP_LATCH|Flaps/Slats (%(38 65 (L:MD11_FLAP_RNG) rng)%{if}Dial-A-Flap %(10 (L:MD11_DIALAFLAP_IND_RNG) 6.6667 / +)%!d!/Extended%{else}%((L:MD11_FLAP_RNG))%{case}%{:0}Up/Retracted%{:20}Up/Extended%{:70}28/Extended%{:82}35/Extended%{:100}50/Extended%{end}%{end})|
 FootPedestalLower.xml|TFDi_Design_MD11_Infinite_Knob|MD11_DIALAFLAP_WHEEL_RNG|Dial-A-Flap (%(10 (L:MD11_DIALAFLAP_IND_RNG) 6.6667 / +)%!d!)|
 FootPedestalUpper.xml|TFDi_Design_MD11_Button_Template|MD11_CTR_SLAT_STOW_BT|Slat Stow|
@@ -868,5 +868,5 @@ RObserverAudio.xml|TFDi_Design_MD11_Volume_Knob|MD11_OBS_AUDIO_PNL_ILS2_VOL_KB|O
 RObserverAudio.xml|TFDi_Design_MD11_Volume_Knob|MD11_OBS_AUDIO_PNL_ADF1_VOL_KB|Observer ADF1 Volume (%((L:MD11_OBS_AUDIO_PNL_ADF1_VOL_BT))%{if}%((L:MD11_OBS_AUDIO_PNL_ADF1_VOL_KB) 10 *)%!d!%%%{else}Disabled%{end})|
 RObserverAudio.xml|TFDi_Design_MD11_Volume_Knob|MD11_OBS_AUDIO_PNL_ADF2_VOL_KB|Observer ADF2 Volume (%((L:MD11_OBS_AUDIO_PNL_ADF2_VOL_BT))%{if}%((L:MD11_OBS_AUDIO_PNL_ADF2_VOL_KB) 10 *)%!d!%%%{else}Disabled%{end})|
 RObserverAudio.xml|TFDi_Design_MD11_Volume_Knob|MD11_OBS_AUDIO_PNL_MKR_VOL_KB|Observer Marker Volume (%((L:MD11_OBS_AUDIO_PNL_MKR_VOL_BT))%{if}%((L:MD11_OBS_AUDIO_PNL_MKR_VOL_KB) 10 *)%!d!%%%{else}Disabled%{end})|
-RObserverLowerMaintenance.xml|TFDi_Design_MD11_Knob_Template|MD11_OBS_CKTBKR_LT_KB|Circuit Breaker Integral Light (%((L:MD11_OBS_CKTBKR_LT_KB) 10 *)%!d!%%)|
+RObserverLowerMaintenance.xml|TFDi_Design_MD11_Knob_Template|MD11_OBS_CKTBKR_LT_KB|Circuit Breaker Panel Light (%((L:MD11_OBS_CKTBKR_LT_KB) 10 *)%!d!%%)|
 |
\ No newline at end of file
diff --git a/xkhofmann-tfdidesign-md11-fixes.code-workspace b/xkhofmann-tfdidesign-md11-fixes.code-workspace
index 52cfec2..0751804 100644
--- a/xkhofmann-tfdidesign-md11-fixes.code-workspace
+++ b/xkhofmann-tfdidesign-md11-fixes.code-workspace
@@ -68,6 +68,7 @@
       "EVTMKR",
       "Exceedance",
       "FADEC",
+      "FCOM",
       "FIRETEST",
       "flaperon",
       "FLAPLIM",