VOID_Rendezvous: Hopefully fixed LSL indication to the reference vessel, not the local vessel, consistent with the rest of the panel.
VOID_Rendezvous: Hopefully fixed LSL indication to the reference vessel, not the local vessel, consistent with the rest of the panel.

--- a/IntCollection.cs
+++ b/IntCollection.cs
@@ -59,7 +59,6 @@
 				return (ushort)((this.collection & (this.mask << idx)) >> idx);
 			}
 			set {
-				Console.WriteLine (value);
 				if (idx < 0) {
 					idx += this.maxCount;
 				}
@@ -71,7 +70,6 @@
 				idx *= wordLength;
 
 				long packvalue = value & this.mask;
-				Console.WriteLine (packvalue);
 
 				this.collection &= ~(this.mask << idx);
 				this.collection |= packvalue << idx;

--- /dev/null
+++ b/ToolbarButtonWrapper.cs
@@ -1,1 +1,529 @@
-
+//
+//  ToolbarWrapper.cs
+//
+//  Author:
+//       toadicus <>
+//
+//  Copyright (c) 2013 toadicus
+//
+//  This program is free software: you can redistribute it and/or modify
+//  it under the terms of the GNU General Public License as published by
+//  the Free Software Foundation, either version 3 of the License, or
+//  (at your option) any later version.
+//
+//  This program is distributed in the hope that it will be useful,
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//  GNU General Public License for more details.
+//
+//  You should have received a copy of the GNU General Public License
+//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+using System;
+using System.Linq;
+using System.Reflection;
+using UnityEngine;
+
+namespace VOID
+{
+	/// <summary>
+	/// Wraps a Toolbar clickable button, after fetching it from a foreign assembly.
+	/// </summary>
+	internal class ToolbarButtonWrapper
+	{
+		protected static System.Type ToolbarManager;
+		protected static object TBManagerInstance;
+		protected static MethodInfo TBManagerAdd;
+
+		/// <summary>
+		/// Wraps the ToolbarManager class, if present.
+		/// </summary>
+		/// <returns><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</returns>
+		protected static bool TryWrapToolbarManager()
+		{
+			if (ToolbarManager == null)
+			{
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Loading ToolbarManager.",
+					"ToolbarButtonWrapper"
+					));
+
+				ToolbarManager = AssemblyLoader.loadedAssemblies
+					.Select(a => a.assembly.GetExportedTypes())
+						.SelectMany(t => t)
+						.FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Loaded ToolbarManager.  Getting Instance.",
+					"ToolbarButtonWrapper"
+					));
+
+				if (ToolbarManager == null)
+				{
+					return false;
+				}
+
+				TBManagerInstance = ToolbarManager.GetProperty(
+					"Instance",
+					System.Reflection.BindingFlags.Public | System.Reflection.BindingFlags.Static
+					)
+					.GetValue(null, null);
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Got ToolbarManager Instance '{1}'.  Getting 'add' method.",
+					"ToolbarButtonWrapper",
+					TBManagerInstance
+					));
+
+				TBManagerAdd = ToolbarManager.GetMethod("add");
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Got ToolbarManager Instance 'add' method.  Loading IButton.",
+					"ToolbarButtonWrapper"
+					));
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether <see cref="Toolbar.ToolbarManager"/> is present.
+		/// </summary>
+		/// <value><c>true</c>, if ToolbarManager is wrapped, <c>false</c> otherwise.</value>
+		public static bool ToolbarManagerPresent
+		{
+			get
+			{
+				return TryWrapToolbarManager();
+			}
+		}
+
+		/// <summary>
+		/// If ToolbarManager is present, initializes a new instance of the <see cref="VOID.ToolbarButtonWrapper"/> class.
+		/// </summary>
+		/// <param name="ns">Namespace, usually the plugin name.</param>
+		/// <param name="id">Identifier, unique per namespace.</param>
+		/// <returns>If ToolbarManager is present, a new <see cref="Toolbar.IButton"/> object, <c>null</c> otherwise.</returns>
+		public static ToolbarButtonWrapper TryWrapToolbarButton(string ns, string id)
+		{
+			if (ToolbarManagerPresent)
+			{
+				object button = TBManagerAdd.Invoke(TBManagerInstance, new object[] { ns, id });
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Added Button '{1}' with ToolbarManager.  Getting 'Text' property",
+					"ToolbarButtonWrapper",
+					button.ToString()
+				));
+
+				return new ToolbarButtonWrapper(button);
+			}
+			else
+			{
+				return null;
+			}
+		}
+
+		protected System.Type IButton;
+		protected object Button;
+		protected PropertyInfo ButtonText;
+		protected PropertyInfo ButtonTextColor;
+		protected PropertyInfo ButtonTexturePath;
+		protected PropertyInfo ButtonToolTip;
+		protected PropertyInfo ButtonVisible;
+		protected PropertyInfo ButtonVisibility;
+		protected PropertyInfo ButtonEffectivelyVisible;
+		protected PropertyInfo ButtonEnalbed;
+		protected PropertyInfo ButtonImportant;
+		protected EventInfo ButtonOnClick;
+		protected EventInfo ButtonOnMouseEnter;
+		protected EventInfo ButtonOnMouseLeave;
+		protected MethodInfo ButtonDestroy;
+		protected System.Type GameScenesVisibilityType;
+
+		/// <summary>
+		/// The text displayed on the button. Set to null to hide text.
+		/// </summary>
+		/// <remarks>
+		/// The text can be changed at any time to modify the button's appearance. Note that since this will also
+		/// modify the button's size, this feature should be used sparingly, if at all.
+		/// </remarks>
+		/// <seealso cref="TexturePath"/>
+		public string Text
+		{
+			get
+			{
+				return this.ButtonText.GetValue(this.Button, null) as String;
+			}
+			set
+			{
+				this.ButtonText.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// The color the button text is displayed with. Defaults to Color.white.
+		/// </summary>
+		/// <remarks>
+		/// The text color can be changed at any time to modify the button's appearance.
+		/// </remarks>
+		public Color TextColor
+		{
+			get
+			{
+				return (Color)this.ButtonTextColor.GetValue(this.Button, null);
+			}
+			set
+			{
+				this.ButtonTextColor.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// The path of a texture file to display an icon on the button. Set to null to hide icon.
+		/// </summary>
+		/// <remarks>
+		/// <para>
+		/// A texture path on a button will have precedence over text. That is, if both text and texture path
+		/// have been set on a button, the button will show the texture, not the text.
+		/// </para>
+		/// <para>
+		/// The texture size must not exceed 24x24 pixels.
+		/// </para>
+		/// <para>
+		/// The texture path must be relative to the "GameData" directory, and must not specify a file name suffix.
+		/// Valid example: MyAddon/Textures/icon_mybutton
+		/// </para>
+		/// <para>
+		/// The texture path can be changed at any time to modify the button's appearance.
+		/// </para>
+		/// </remarks>
+		/// <seealso cref="Text"/>
+		public string TexturePath
+		{
+			get
+			{
+				return this.ButtonTexturePath.GetValue(this.Button, null) as string;
+			}
+			set
+			{
+				this.ButtonTexturePath.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// The button's tool tip text. Set to null if no tool tip is desired.
+		/// </summary>
+		/// <remarks>
+		/// Tool Tip Text Should Always Use Headline Style Like This.
+		/// </remarks>
+		public string ToolTip
+		{
+			get
+			{
+				return this.ButtonToolTip.GetValue(this.Button, null) as string;
+			}
+			set
+			{
+				this.ButtonToolTip.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// Whether this button is currently visible or not. Can be used in addition to or as a replacement for <see cref="Visibility"/>.
+		/// </summary>
+		public bool Visible
+		{
+			get
+			{
+				return (bool)this.ButtonVisible.GetValue(this.Button, null);
+			}
+			set
+			{
+				this.ButtonVisible.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// Whether this button is currently effectively visible or not. This is a combination of
+		/// <see cref="Visible"/> and <see cref="Visibility"/>.
+		/// </summary>
+		/// <remarks>
+		/// Note that the toolbar is not visible in certain game scenes, for example the loading screens. This property
+		/// does not reflect button invisibility in those scenes.
+		/// </remarks>
+		public bool EffectivelyVisible
+		{
+			get
+			{
+				return (bool)this.ButtonEffectivelyVisible.GetValue(this.Button, null);
+			}
+		}
+
+		/// <summary>
+		/// Whether this button is currently enabled (clickable) or not. This will not affect the player's ability to
+		/// position the button on their screen.
+		/// </summary>
+		public bool Enabled
+		{
+			get
+			{
+				return (bool)this.ButtonEnalbed.GetValue(this.Button, null);
+			}
+			set
+			{
+				this.ButtonEnalbed.SetValue(this.Button, value, null);
+			}
+		}
+
+		/// <summary>
+		/// Whether this button is currently "important."  Set to false to return to normal button behaviour.
+		/// </summary>
+		/// <remarks>
+		/// <para>
+		/// This can be used to temporarily force the button to be shown on the screen regardless of the toolbar being
+		/// currently in auto-hidden mode.  For example, a button that signals the arrival of a private message in a
+		/// chat room could mark itself as "important" as long as the message has not been read.
+		/// </para>
+		/// <para>
+		/// Setting this property does not change the appearance of the button.  use <see cref="TexturePath"/>  to
+		/// change the button's icon.
+		/// </para>
+		/// <para>
+		/// This feature should be used only sparingly, if at all, since it forces the button to be displayed on screen
+		/// even when it normally wouldn't.
+		/// </para>
+		/// </remarks>
+		/// <value><c>true</c> if important; otherwise, <c>false</c>.</value>
+		public bool Important
+		{
+			get
+			{
+				return (bool)this.ButtonImportant.GetValue(this.Button, null);
+			}
+			set
+			{
+				this.ButtonImportant.SetValue(this.Button, value, null);
+			}
+		}
+
+		private ToolbarButtonWrapper()
+		{
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="VOID.ToolbarButtonWrapper"/> class.
+		/// </summary>
+		/// <param name="ns">Namespace, usually the plugin name.</param>
+		/// <param name="id">Identifier, unique per namespace.</param>
+		protected ToolbarButtonWrapper(object button)
+		{
+			this.Button = button;
+
+			this.IButton = AssemblyLoader.loadedAssemblies
+				.Select(a => a.assembly.GetExportedTypes())
+				.SelectMany(t => t)
+				.FirstOrDefault(t => t.FullName == "Toolbar.IButton");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Loaded IButton.  Adding Button with ToolbarManager.",
+				this.GetType().Name
+			));
+
+			this.ButtonText = this.IButton.GetProperty("Text");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Text' property.  Getting 'TextColor' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonTextColor = this.IButton.GetProperty("TextColor");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'TextColor' property.  Getting 'TexturePath' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonTexturePath = this.IButton.GetProperty("TexturePath");
+			
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'TexturePath' property.  Getting 'ToolTip' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonToolTip = this.IButton.GetProperty("ToolTip");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'ToolTip' property.  Getting 'Visible' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonVisible = this.IButton.GetProperty("Visible");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Visible' property.  Getting 'Visibility' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonVisibility = this.IButton.GetProperty("Visibility");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Visibility' property.  Getting 'EffectivelyVisible' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonEffectivelyVisible = this.IButton.GetProperty("EffectivelyVisible");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Visibility' property.  Getting 'Enabled' property.",
+				this.GetType().Name
+			));
+
+			this.ButtonEnalbed = this.IButton.GetProperty("Enabled");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Enabled' property.  Getting 'OnClick' event.",
+				this.GetType().Name
+			));
+
+			this.ButtonImportant = this.IButton.GetProperty("Important");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Enabled' property.  Getting 'OnClick' event.",
+				this.GetType().Name
+			));
+
+			this.ButtonOnClick = this.IButton.GetEvent("OnClick");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'OnClick' event '{1}'.  Getting 'OnMouseEnter' event.",
+				this.GetType().Name,
+				this.ButtonOnClick.ToString()
+			));
+
+			this.ButtonOnMouseEnter = this.IButton.GetEvent("OnMouseEnter");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'OnMouseEnter' event '{1}'.  Getting 'OnMouseLeave' event.",
+				this.GetType().Name,
+				this.ButtonOnClick.ToString()
+				));
+
+			this.ButtonOnMouseLeave = this.IButton.GetEvent("OnMouseLeave");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'OnMouseLeave' event '{1}'.  Getting 'Destroy' method.",
+				this.GetType().Name,
+				this.ButtonOnClick.ToString()
+				));
+
+			this.ButtonDestroy = this.IButton.GetMethod("Destroy");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'Destroy' property '{1}'.  Loading GameScenesVisibility class.",
+				this.GetType().Name,
+				this.ButtonDestroy.ToString()
+			));
+
+			this.GameScenesVisibilityType = AssemblyLoader.loadedAssemblies
+				.Select(a => a.assembly.GetExportedTypes())
+					.SelectMany(t => t)
+					.FirstOrDefault(t => t.FullName == "Toolbar.GameScenesVisibility");
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Got 'GameScenesVisibility' class '{1}'.",
+				this.GetType().Name,
+				this.GameScenesVisibilityType.ToString()
+			));
+
+			Tools.PostDebugMessage("ToolbarButtonWrapper built!");
+		}
+
+		/// <summary>
+		/// Adds event handler to receive "on click" events.
+		/// </summary>
+		/// <example>
+		/// <code>
+		/// ToolbarButtonWrapper button = ...
+		/// button.AddButtonClickHandler(
+		/// 	(e) =>
+		/// 	{
+		/// 		Debug.Log("button clicked, mouseButton: " + e.Mousebutton");
+		/// 	}
+		/// );
+		/// </code>
+		/// </example>
+		/// <param name="Handler">Delegate to handle "on click" events</param>
+		public void AddButtonClickHandler(Action<object> Handler)
+		{
+			this.AddButtonEventHandler(this.ButtonOnClick, Handler);
+		}
+
+		/// <summary>
+		/// Adds event handler that can be registered with to receive "on mouse enter" events.
+		/// </summary>
+		/// <example>
+		/// <code>
+		/// ToolbarWrapperButton button = ...
+		/// button.AddButtonOnMouseEnterHandler(
+		/// 	(e) =>
+		/// 	{
+		/// 		Debug.Log("mouse entered button");
+		/// 	}
+		/// );
+		/// </code>
+		/// </example>
+		/// <param name="Handler">Delegate to handle "OnMouseEnter" events.</param>
+		public void AddButtonOnMouseEnterHandler(Action<object> Handler)
+		{
+			this.AddButtonEventHandler(this.ButtonOnMouseEnter, Handler);
+		}
+
+		/// <summary>
+		/// Adds event handler that can be registered with to receive "on mouse leave" events.
+		/// </summary>
+		/// <example>
+		/// <code>
+		/// ToolbarWrapperButton button = ...
+		/// button.AddButtonOnMouseLeaveHandler(
+		/// 	(e) =>
+		/// 	{
+		/// 		Debug.Log("mouse left button");
+		/// 	}
+		/// );
+		/// </code>
+		/// </example>
+		/// <param name="Handler">Delegate to handle "OnMouseLeave" events.</param>
+		public void AddButtonOnMouseLeaveHandler(Action<object> Handler)
+		{
+			this.AddButtonEventHandler(this.ButtonOnMouseLeave, Handler);
+		}
+
+		/// <summary>
+		/// Sets this button's visibility. Can be used in addition to or as a replacement for <see cref="Visible"/>.
+		/// </summary>
+		/// <param name="gameScenes">Array of GameScene objects in which the button should be visible.</param>
+		public void SetButtonVisibility(params GameScenes[] gameScenes)
+		{
+			object GameScenesVisibilityObj = Activator.CreateInstance(this.GameScenesVisibilityType, gameScenes);
+			this.ButtonVisibility.SetValue(this.Button, GameScenesVisibilityObj, null);
+		}
+
+		/// <summary>
+		/// Permanently destroys this button so that it is no longer displayed.
+		/// Should be used when a plugin is stopped to remove leftover buttons.
+		/// </summary>
+		public void Destroy()
+		{
+			this.ButtonDestroy.Invoke(this.Button, null);
+		}
+
+		// Utility method for use with the AddButton<event>Handler API methods.
+		protected void AddButtonEventHandler(EventInfo Event, Action<object> Handler)
+		{
+			Delegate d = Delegate.CreateDelegate(Event.EventHandlerType, Handler.Target, Handler.Method);
+			MethodInfo addHandler = Event.GetAddMethod();
+			addHandler.Invoke(this.Button, new object[] { d });
+		}
+	}
+}
+

file:a/Tools.cs -> file:b/Tools.cs
--- a/Tools.cs
+++ b/Tools.cs
@@ -25,7 +25,6 @@
 //
 ///////////////////////////////////////////////////////////////////////////////
 
-
 using System;
 using System.Collections.Generic;
 using UnityEngine;
@@ -51,9 +50,13 @@
 			try
 			{
 				CBAttributeMap BiomeMap = vessel.mainBody.BiomeMap;
+
 				double lat = vessel.latitude * Math.PI / 180d;
 				double lon = vessel.longitude * Math.PI / 180d;
 
+				mapAttribute = BiomeMap.GetAtt(lat, lon);
+
+				/*
 				lon -= Math.PI / 2d;
 
 				if (lon < 0d)
@@ -64,7 +67,7 @@
 				float v = (float)(lat / Math.PI) + 0.5f;
 				float u = (float)(lon / (2d * Math.PI));
 
-				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear (u, v);
+				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
 				mapAttribute = BiomeMap.defaultAttribute;
 
 				if (BiomeMap.Map != null)
@@ -85,7 +88,7 @@
 						float num = 1 / zero;
 						for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
 						{
-							Color mapColor = BiomeMap.Attributes [j].mapColor;
+							Color mapColor = BiomeMap.Attributes[j].mapColor;
 							float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
 							if (sqrMagnitude < num)
 							{
@@ -103,6 +106,7 @@
 						}
 					}
 				}
+				*/
 			}
 			catch (NullReferenceException)
 			{
@@ -113,7 +117,7 @@
 			return mapAttribute;
 		}
 
-		public static string GetLongitudeString(Vessel vessel, string format="F4")
+		public static string GetLongitudeString(Vessel vessel, string format = "F4")
 		{
 			string dir_long = "W";
 			double v_long = vessel.longitude;
@@ -129,16 +133,18 @@
 				v_long -= 360d;
 			}
 
-			if (v_long > 0) dir_long = "E";
+			if (v_long > 0)
+				dir_long = "E";
 
 			return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
 		}
 
-		public static string GetLatitudeString(Vessel vessel, string format="F4")
+		public static string GetLatitudeString(Vessel vessel, string format = "F4")
 		{
 			string dir_lat = "S";
 			double v_lat = vessel.latitude;
-			if (v_lat > 0) dir_lat = "N";
+			if (v_lat > 0)
+				dir_lat = "N";
 
 			return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
 		}
@@ -200,27 +206,35 @@
 				return value.ToString(format);
 			}
 		}
-
 		//From http://svn.mumech.com/KSP/trunk/MuMechLib/VOID.vesselState.cs
 		public static double MuMech_get_heading(Vessel vessel)
 		{
-			Vector3d CoM = vessel.findWorldCenterOfMass();
+			Vector3d CoM;
+
+			try
+			{
+				CoM = vessel.findWorldCenterOfMass();
+			}
+			catch
+			{
+				return double.NaN;
+			}
+
 			Vector3d up = (CoM - vessel.mainBody.position).normalized;
 			Vector3d north = Vector3d.Exclude(
-				up,
-				(vessel.mainBody.position +
-					vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
-				) - CoM).normalized;
+				                 up,
+				                 (vessel.mainBody.position +
+				                 vessel.mainBody.transform.up * (float)vessel.mainBody.Radius
+				                 ) - CoM).normalized;
 
 			Quaternion rotationSurface = Quaternion.LookRotation(north, up);
 			Quaternion rotationvesselSurface = Quaternion.Inverse(
-				Quaternion.Euler(90, 0, 0) *
-				Quaternion.Inverse(vessel.transform.rotation) *
-				rotationSurface);
+				                                   Quaternion.Euler(90, 0, 0) *
+				                                   Quaternion.Inverse(vessel.transform.rotation) *
+				                                   rotationSurface);
 
 			return rotationvesselSurface.eulerAngles.y;
 		}
-
 		//From http://svn.mumech.com/KSP/trunk/MuMechLib/MuUtils.cs
 		public static string MuMech_ToSI(
 			double d, int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue
@@ -233,76 +247,76 @@
 			{
 				switch ((int)Math.Floor(exponent))
 				{
-				case 0:
-				case 1:
-				case 2:
-					return d.ToString("F" + digits);
-				case 3:
-				case 4:
-				case 5:
-					return (d / 1e3).ToString("F" + digits) + "k";
-				case 6:
-				case 7:
-				case 8:
-					return (d / 1e6).ToString("F" + digits) + "M";
-				case 9:
-				case 10:
-				case 11:
-					return (d / 1e9).ToString("F" + digits) + "G";
-				case 12:
-				case 13:
-				case 14:
-					return (d / 1e12).ToString("F" + digits) + "T";
-				case 15:
-				case 16:
-				case 17:
-					return (d / 1e15).ToString("F" + digits) + "P";
-				case 18:
-				case 19:
-				case 20:
-					return (d / 1e18).ToString("F" + digits) + "E";
-				case 21:
-				case 22:
-				case 23:
-					return (d / 1e21).ToString("F" + digits) + "Z";
-				default:
-					return (d / 1e24).ToString("F" + digits) + "Y";
+					case 0:
+					case 1:
+					case 2:
+						return d.ToString("F" + digits);
+					case 3:
+					case 4:
+					case 5:
+						return (d / 1e3).ToString("F" + digits) + "k";
+					case 6:
+					case 7:
+					case 8:
+						return (d / 1e6).ToString("F" + digits) + "M";
+					case 9:
+					case 10:
+					case 11:
+						return (d / 1e9).ToString("F" + digits) + "G";
+					case 12:
+					case 13:
+					case 14:
+						return (d / 1e12).ToString("F" + digits) + "T";
+					case 15:
+					case 16:
+					case 17:
+						return (d / 1e15).ToString("F" + digits) + "P";
+					case 18:
+					case 19:
+					case 20:
+						return (d / 1e18).ToString("F" + digits) + "E";
+					case 21:
+					case 22:
+					case 23:
+						return (d / 1e21).ToString("F" + digits) + "Z";
+					default:
+						return (d / 1e24).ToString("F" + digits) + "Y";
 				}
 			}
 			else if (exponent < 0)
 			{
 				switch ((int)Math.Floor(exponent))
 				{
-				case -1:
-				case -2:
-				case -3:
-					return (d * 1e3).ToString("F" + digits) + "m";
-				case -4:
-				case -5:
-				case -6:
-					return (d * 1e6).ToString("F" + digits) + "μ";
-				case -7:
-				case -8:
-				case -9:
-					return (d * 1e9).ToString("F" + digits) + "n";
-				case -10:
-				case -11:
-				case -12:
-					return (d * 1e12).ToString("F" + digits) + "p";
-				case -13:
-				case -14:
-				case -15:
-					return (d * 1e15).ToString("F" + digits) + "f";
-				case -16:
-				case -17:
-				case -18:
-					return (d * 1e18).ToString("F" + digits) + "a";
-				case -19:
-				case -20:
-				case -21:
-					return (d * 1e21).ToString("F" + digits) + "z";
-				default:
-					return (d * 1e24).ToString("F" + digits) + "y";
+					case -1:
+					case -2:
+					case -3:
+						return (d * 1e3).ToString("F" + digits) + "m";
+					case -4:
+					case -5:
+					case -6:
+						return (d * 1e6).ToString("F" + digits) + "μ";
+					case -7:
+					case -8:
+					case -9:
+						return (d * 1e9).ToString("F" + digits) + "n";
+					case -10:
+					case -11:
+					case -12:
+						return (d * 1e12).ToString("F" + digits) + "p";
+					case -13:
+					case -14:
+					case -15:
+						return (d * 1e15).ToString("F" + digits) + "f";
+					case -16:
+					case -17:
+					case -18:
+						return (d * 1e18).ToString("F" + digits) + "a";
+					case -19:
+					case -20:
+					case -21:
+						return (d * 1e21).ToString("F" + digits) + "z";
+					default:
+						return (d * 1e24).ToString("F" + digits) + "y";
 				}
 			}
 			else
@@ -371,9 +385,7 @@
 			a[0] = char.ToUpper(a[0]);
 			return new string(a);
 		}
-
 		//transfer angles
-
 		public static double Nivvy_CalcTransferPhaseAngle(double r_current, double r_target, double grav_param)
 		{
 			double T_target = (2 * Math.PI) * Math.Sqrt(Math.Pow((r_target / 1000), 3) / (grav_param / 1000000000));
@@ -447,25 +459,42 @@
 			// returns the ejection angle
 		}
 
-		public static double Adammada_CurrrentPhaseAngle(double body_LAN, double body_orbitPct, double origin_LAN, double origin_orbitPct)
+		public static double Adammada_CurrrentPhaseAngle(
+			double body_LAN,
+			double body_orbitPct,
+			double origin_LAN,
+			double origin_orbitPct
+		)
 		{
 			double angle = (body_LAN / 360 + body_orbitPct) - (origin_LAN / 360 + origin_orbitPct);
-			if (angle > 1) angle = angle - 1;
-			if (angle < 0) angle = angle + 1;
-			if (angle > 0.5) angle = angle - 1;
+			if (angle > 1)
+				angle = angle - 1;
+			if (angle < 0)
+				angle = angle + 1;
+			if (angle > 0.5)
+				angle = angle - 1;
 			angle = angle * 360;
 			return angle;
 		}
 
-		public static double Adammada_CurrentEjectionAngle(double vessel_long, double origin_rotAngle, double origin_LAN, double origin_orbitPct)
+		public static double Adammada_CurrentEjectionAngle(
+			double vessel_long,
+			double origin_rotAngle,
+			double origin_LAN,
+			double origin_orbitPct
+		)
 		{
 			//double eangle = ((FlightGlobals.ActiveVOID.vessel.longitude + orbiting.rotationAngle) - (orbiting.orbit.LAN / 360 + orbiting.orbit.orbitPercent) * 360);
 			double eangle = ((vessel_long + origin_rotAngle) - (origin_LAN / 360 + origin_orbitPct) * 360);
 
-			while (eangle < 0) eangle = eangle + 360;
-			while (eangle > 360) eangle = eangle - 360;
-			if (eangle < 270) eangle = 90 - eangle;
-			else eangle = 450 - eangle;
+			while (eangle < 0)
+				eangle = eangle + 360;
+			while (eangle > 360)
+				eangle = eangle - 360;
+			if (eangle < 270)
+				eangle = 90 - eangle;
+			else
+				eangle = 450 - eangle;
 			return eangle;
 		}
 
@@ -492,7 +521,8 @@
 
 			double phase = Vector3d.Angle(vecthis, vectarget);
 
-			if (Vector3d.Angle(prograde, vectarget) > 90) phase = 360 - phase;
+			if (Vector3d.Angle(prograde, vectarget) > 90)
+				phase = 360 - phase;
 
 			return (phase + 360) % 360;
 		}
@@ -500,7 +530,8 @@
 		public static double FixAngleDomain(double Angle, bool Degrees = false)
 		{
 			double Extent = 2d * Math.PI;
-			if (Degrees) {
+			if (Degrees)
+			{
 				Extent = 360d;
 			}
 
@@ -515,20 +546,24 @@
 
 		public static double FixDegreeDomain(double Angle)
 		{
-			return FixAngleDomain (Angle, true);
+			return FixAngleDomain(Angle, true);
 		}
 
 		public static double adjustCurrPhaseAngle(double transfer_angle, double curr_phase)
 		{
 			if (transfer_angle < 0)
 			{
-				if (curr_phase > 0) return (-1 * (360 - curr_phase));
-				else if (curr_phase < 0) return curr_phase;
+				if (curr_phase > 0)
+					return (-1 * (360 - curr_phase));
+				else if (curr_phase < 0)
+					return curr_phase;
 			}
 			else if (transfer_angle > 0)
 			{
-				if (curr_phase > 0) return curr_phase;
-				else if (curr_phase < 0) return (360 + curr_phase);
+				if (curr_phase > 0)
+					return curr_phase;
+				else if (curr_phase < 0)
+					return (360 + curr_phase);
 			}
 			return curr_phase;
 		}
@@ -546,8 +581,10 @@
 			// if < 0, add curr to 360  // 360 + (-17) = 343
 			// else its good as it is
 
-			if (curr_ejection < 0) return 360 + curr_ejection;
-			else return curr_ejection;
+			if (curr_ejection < 0)
+				return 360 + curr_ejection;
+			else
+				return curr_ejection;
 
 		}
 
@@ -557,8 +594,10 @@
 			//180 + curr_ejection
 			// else if transfer_phase_angle > 0 its good as it is
 
-			if (trans_phase < 0) return 180 + trans_ejection;
-			else return trans_ejection;
+			if (trans_phase < 0)
+				return 180 + trans_ejection;
+			else
+				return trans_ejection;
 
 		}
 
@@ -568,7 +607,7 @@
 
 			// HACK: This assumes that on worlds with oceans, all water is fixed at 0 m,
 			// and water covers the whole surface at 0 m.
-			if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean )
+			if (vessel.terrainAltitude < 0 && vessel.mainBody.ocean)
 			{
 				trueAltitude = vessel.orbit.altitude;
 			}
@@ -578,50 +617,107 @@
 
 		public static string get_heading_text(double heading)
 		{
-			if (heading > 348.75 || heading <= 11.25) return "N";
-			else if (heading > 11.25 && heading <= 33.75) return "NNE";
-			else if (heading > 33.75 && heading <= 56.25) return "NE";
-			else if (heading > 56.25 && heading <= 78.75) return "ENE";
-			else if (heading > 78.75 && heading <= 101.25) return "E";
-			else if (heading > 101.25 && heading <= 123.75) return "ESE";
-			else if (heading > 123.75 && heading <= 146.25) return "SE";
-			else if (heading > 146.25 && heading <= 168.75) return "SSE";
-			else if (heading > 168.75 && heading <= 191.25) return "S";
-			else if (heading > 191.25 && heading <= 213.75) return "SSW";
-			else if (heading > 213.75 && heading <= 236.25) return "SW";
-			else if (heading > 236.25 && heading <= 258.75) return "WSW";
-			else if (heading > 258.75 && heading <= 281.25) return "W";
-			else if (heading > 281.25 && heading <= 303.75) return "WNW";
-			else if (heading > 303.75 && heading <= 326.25) return "NW";
-			else if (heading > 326.25 && heading <= 348.75) return "NNW";
-			else return "";
-		}
-
-
+			if (heading > 348.75 || heading <= 11.25)
+				return "N";
+			else if (heading > 11.25 && heading <= 33.75)
+				return "NNE";
+			else if (heading > 33.75 && heading <= 56.25)
+				return "NE";
+			else if (heading > 56.25 && heading <= 78.75)
+				return "ENE";
+			else if (heading > 78.75 && heading <= 101.25)
+				return "E";
+			else if (heading > 101.25 && heading <= 123.75)
+				return "ESE";
+			else if (heading > 123.75 && heading <= 146.25)
+				return "SE";
+			else if (heading > 146.25 && heading <= 168.75)
+				return "SSE";
+			else if (heading > 168.75 && heading <= 191.25)
+				return "S";
+			else if (heading > 191.25 && heading <= 213.75)
+				return "SSW";
+			else if (heading > 213.75 && heading <= 236.25)
+				return "SW";
+			else if (heading > 236.25 && heading <= 258.75)
+				return "WSW";
+			else if (heading > 258.75 && heading <= 281.25)
+				return "W";
+			else if (heading > 281.25 && heading <= 303.75)
+				return "WNW";
+			else if (heading > 303.75 && heading <= 326.25)
+				return "NW";
+			else if (heading > 326.25 && heading <= 348.75)
+				return "NNW";
+			else
+				return "";
+		}
 
 		public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
 		{
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter).ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+					vessel.orbit.semiMajorAxis,
+					body.orbit.semiMajorAxis,
+					vessel.mainBody.gravParameter
+				).ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000)) * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				(Tools.Younata_DeltaVToGetToOtherBody(
+					(vessel.mainBody.gravParameter / 1000000000),
+					(vessel.orbit.semiMajorAxis / 1000),
+					(body.orbit.semiMajorAxis / 1000)
+				) * 1000).ToString("F2") + "m/s",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 		}
 
 		public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
-			double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
-
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
+			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+				             (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				             (vessel.mainBody.orbit.semiMajorAxis / 1000),
+				             (body.orbit.semiMajorAxis / 1000)
+			             );
+			double dv2 = Tools.Younata_DeltaVToExitSOI(
+				             (vessel.mainBody.gravParameter / 1000000000),
+				             (vessel.orbit.semiMajorAxis / 1000),
+				             (vessel.mainBody.sphereOfInfluence / 1000),
+				             Math.Abs(dv1)
+			             );
+
+			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+				                              (vessel.orbit.semiMajorAxis / 1000),
+				                              dv2,
+				                              (Math.PI / 2.0),
+				                              (vessel.mainBody.gravParameter / 1000000000)
+			                              );
+			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+				                             FlightGlobals.ActiveVessel.longitude,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			                             );
+
+			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+				                           vessel.mainBody.orbit.semiMajorAxis,
+				                           body.orbit.semiMajorAxis,
+				                           vessel.mainBody.referenceBody.gravParameter
+			                           ) % 360;
+			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+				                          body.orbit.LAN,
+				                          body.orbit.orbitPercent,
+				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			                          );
 
 			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
 			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
@@ -629,12 +725,18 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Ejection angle (curr/trans):");
-			GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -645,13 +747,24 @@
 
 		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.gravParameter);
+			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+				             (vessel.mainBody.gravParameter / 1000000000),
+				             (vessel.orbit.semiMajorAxis / 1000),
+				             (body.orbit.semiMajorAxis / 1000)
+			             );
+
+			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+				                           vessel.orbit.semiMajorAxis,
+				                           body.orbit.semiMajorAxis,
+				                           vessel.mainBody.gravParameter
+			                           );
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -662,14 +775,42 @@
 
 		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody((vessel.mainBody.referenceBody.gravParameter / 1000000000), (vessel.mainBody.orbit.semiMajorAxis / 1000), (body.orbit.semiMajorAxis / 1000));
-			double dv2 = Tools.Younata_DeltaVToExitSOI((vessel.mainBody.gravParameter / 1000000000), (vessel.orbit.semiMajorAxis / 1000), (vessel.mainBody.sphereOfInfluence / 1000), Math.Abs(dv1));
-			double trans_ejection_angle = Tools.Younata_TransferBurnPoint((vessel.orbit.semiMajorAxis / 1000), dv2, (Math.PI / 2.0), (vessel.mainBody.gravParameter / 1000000000));
-
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(body.orbit.LAN, body.orbit.orbitPercent, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(FlightGlobals.ActiveVessel.longitude, FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN, FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent);
-
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(vessel.mainBody.orbit.semiMajorAxis, body.orbit.semiMajorAxis, vessel.mainBody.referenceBody.gravParameter) % 360;
+			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+				             (vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				             (vessel.mainBody.orbit.semiMajorAxis / 1000),
+				             (body.orbit.semiMajorAxis / 1000)
+			             );
+			double dv2 = Tools.Younata_DeltaVToExitSOI(
+				             (vessel.mainBody.gravParameter / 1000000000),
+				             (vessel.orbit.semiMajorAxis / 1000),
+				             (vessel.mainBody.sphereOfInfluence / 1000),
+				             Math.Abs(dv1)
+			             );
+			double trans_ejection_angle = Tools.Younata_TransferBurnPoint(
+				                              (vessel.orbit.semiMajorAxis / 1000),
+				                              dv2,
+				                              (Math.PI / 2.0),
+				                              (vessel.mainBody.gravParameter / 1000000000)
+			                              );
+
+			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+				                          body.orbit.LAN,
+				                          body.orbit.orbitPercent,
+				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				                          FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			                          );
+			double curr_ejection_angle = Tools.Adammada_CurrentEjectionAngle(
+				                             FlightGlobals.ActiveVessel.longitude,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.rotationAngle,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.LAN,
+				                             FlightGlobals.ActiveVessel.orbit.referenceBody.orbit.orbitPercent
+			                             );
+
+			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+				                           vessel.mainBody.orbit.semiMajorAxis,
+				                           body.orbit.semiMajorAxis,
+				                           vessel.mainBody.referenceBody.gravParameter
+			                           ) % 360;
 
 			double adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
 			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
@@ -683,12 +824,18 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
-			GUILayout.Label(adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				adj_phase_angle.ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Ejection angle (curr/trans):");
-			GUILayout.Label(adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°", GUILayout.ExpandWidth(false));
+			GUILayout.Label(
+				adj_curr_ejection_angle.ToString("F3") + "° / " + adj_trans_ejection_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
 			GUILayout.EndHorizontal();
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -696,12 +843,11 @@
 			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
 			GUILayout.EndHorizontal();
 		}
-
 		// This implementation is adapted from FARGUIUtils.ClampToScreen
 		public static Rect ClampRectToScreen(Rect window, int xMargin, int yMargin)
 		{
-			window.x = Mathf.Clamp (window.x, xMargin - window.width, Screen.width - xMargin);
-			window.y = Mathf.Clamp (window.y, yMargin - window.height, Screen.height - yMargin);
+			window.x = Mathf.Clamp(window.x, xMargin - window.width, Screen.width - xMargin);
+			window.y = Mathf.Clamp(window.y, yMargin - window.height, Screen.height - yMargin);
 
 			return window;
 		}
@@ -713,13 +859,13 @@
 
 		public static Rect ClampRectToScreen(Rect window)
 		{
-			return ClampRectToScreen (window, 30);
+			return ClampRectToScreen(window, 30);
 		}
 
 		public static Vector2 ClampV2ToScreen(Vector2 vec, uint xMargin, uint yMargin)
 		{
-			vec.x = Mathf.Clamp (vec.x, xMargin, Screen.width - xMargin);
-			vec.y = Mathf.Clamp (vec.y, yMargin, Screen.height - yMargin);
+			vec.x = Mathf.Clamp(vec.x, xMargin, Screen.width - xMargin);
+			vec.y = Mathf.Clamp(vec.y, yMargin, Screen.height - yMargin);
 
 			return vec;
 		}
@@ -731,24 +877,21 @@
 
 		public static Vector2 ClampV2ToScreen(Vector2 vec)
 		{
-			return ClampV2ToScreen (vec, 15);
-		}
-
+			return ClampV2ToScreen(vec, 15);
+		}
 		// UNDONE: This seems messy.  Can we clean it up?
 		public static Rect DockToWindow(Rect icon, Rect window)
 		{
 			// We can't set the x and y of the center point directly, so build a new vector.
-			Vector2 center = new Vector2 ();
+			Vector2 center = new Vector2();
 
 			// If we are near the top or bottom of the screen...
 			if (window.yMax > Screen.height - icon.height ||
-				window.yMin < icon.height
-			)
+			    window.yMin < icon.height)
 			{
 				// If we are in a corner...
 				if (window.xMax > Screen.width - icon.width ||
-					window.xMin < icon.width
-				)
+				    window.xMin < icon.width)
 				{
 					// If it is a top corner, put the icon below the window.
 					if (window.yMax < Screen.height / 2)
@@ -797,8 +940,7 @@
 
 				// If we are along a side...
 				if (window.xMax > Screen.width - icon.width ||
-					window.xMin < icon.width
-				)
+				    window.xMin < icon.width)
 				{
 					// UNDONE: I'm not sure I like the feel of this part.
 					// If we are along a side towards the bottom, put the icon below the window
@@ -827,6 +969,59 @@
 			return icon;
 		}
 
+		public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
+		{
+			Vessel.Situations situation = vessel.situation;
+
+			switch (situation)
+			{
+				case Vessel.Situations.PRELAUNCH:
+				case Vessel.Situations.LANDED:
+					return ExperimentSituations.SrfLanded;
+				case Vessel.Situations.SPLASHED:
+					return ExperimentSituations.SrfSplashed;
+				case Vessel.Situations.FLYING:
+					if (vessel.altitude < (double)vessel.mainBody.scienceValues.flyingAltitudeThreshold)
+					{
+						return ExperimentSituations.FlyingLow;
+					}
+					else
+					{
+						return ExperimentSituations.FlyingHigh;
+					}
+			}
+
+			if (vessel.altitude < (double)vessel.mainBody.scienceValues.spaceAltitudeThreshold)
+			{
+				return ExperimentSituations.InSpaceLow;
+			}
+			else
+			{
+				return ExperimentSituations.InSpaceHigh;
+			}
+		}
+
+		public static string HumanString(this ExperimentSituations situation)
+		{
+			switch (situation)
+			{
+				case ExperimentSituations.FlyingHigh:
+					return "Upper Atmosphere";
+				case ExperimentSituations.FlyingLow:
+					return "Flying";
+				case ExperimentSituations.SrfLanded:
+					return "Surface";
+				case ExperimentSituations.InSpaceLow:
+					return "Near in Space";
+				case ExperimentSituations.InSpaceHigh:
+					return "High in Space";
+				case ExperimentSituations.SrfSplashed:
+					return "Splashed Down";
+				default:
+					return "Unknown";
+			}
+		}
+
 		private static ScreenMessage debugmsg = new ScreenMessage("", 2f, ScreenMessageStyle.UPPER_RIGHT);
 
 		[System.Diagnostics.Conditional("DEBUG")]

--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -32,8 +32,6 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 using System;
-using System.Collections.Generic;
-using System.Linq;
 using UnityEngine;
 using Engineer.VesselSimulator;
 

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -102,7 +102,7 @@
 			//}
 
 			//toggle for orbital info chunk
-			if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital = !toggleOrbital;
+			if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
 
 			if (toggleOrbital)
 			{
@@ -156,7 +156,7 @@
 			}
 
 			//toggle for physical info chunk
-			if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical = !togglePhysical;
+			if (GUILayout.Button("Physical Characteristics", GUILayout.ExpandWidth(true))) togglePhysical.value = !togglePhysical;
 
 			if (togglePhysical)
 			{

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -33,15 +33,17 @@
 		 * Static Members
 		 * */
 		protected static bool _initialized = false;
+
 		public static bool Initialized
 		{
-			get 
-			{
-			return _initialized;
+			get
+			{
+				return _initialized;
 			}
 		}
 
 		protected static VOID_Core _instance;
+
 		public static VOID_Core Instance
 		{
 			get
@@ -63,96 +65,79 @@
 		}
 
 		public static double Constant_G = 6.674e-11;
-
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.9.14";
-
+		protected string VoidVersion = "0.9.19";
 		protected bool _factoryReset = false;
-
 		[AVOID_SaveValue("configValue")]
 		protected VOID_SaveValue<int> configVersion = 1;
-
 		protected List<IVOID_Module> _modules = new List<IVOID_Module>();
 		protected bool _modulesLoaded = false;
-
 		[AVOID_SaveValue("mainWindowPos")]
 		protected VOID_SaveValue<Rect> mainWindowPos = new Rect(475, 575, 10f, 10f);
-
 		[AVOID_SaveValue("mainGuiMinimized")]
 		protected VOID_SaveValue<bool> mainGuiMinimized = false;
-
 		[AVOID_SaveValue("configWindowPos")]
 		protected VOID_SaveValue<Rect> configWindowPos = new Rect(825, 625, 10f, 10f);
-
 		[AVOID_SaveValue("configWindowMinimized")]
 		protected VOID_SaveValue<bool> configWindowMinimized = true;
-
 		[AVOID_SaveValue("VOIDIconPos")]
-		protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 30, 30f, 30f);
-		protected Texture2D VOIDIconOff = new Texture2D(30, 30, TextureFormat.ARGB32, false);
-		protected Texture2D VOIDIconOn = new Texture2D(30, 30, TextureFormat.ARGB32, false);
+		protected VOID_SaveValue<Rect> VOIDIconPos = new Rect(Screen.width / 2 - 200, Screen.height - 32, 32f, 32f);
+		protected Texture2D VOIDIconOff;
+		protected Texture2D VOIDIconOn;
 		protected Texture2D VOIDIconTexture;
 		protected string VOIDIconOnPath = "VOID/Textures/void_icon_on";
 		protected string VOIDIconOffPath = "VOID/Textures/void_icon_off";
 		protected bool VOIDIconLocked = true;
-
+		protected GUIStyle iconStyle;
 		protected int windowBaseID = -96518722;
 		protected int _windowID = 0;
-
 		protected bool GUIStylesLoaded = false;
-
 		protected Dictionary<string, GUIStyle> _LabelStyles = new Dictionary<string, GUIStyle>();
-
 		[AVOID_SaveValue("togglePower")]
 		public VOID_SaveValue<bool> togglePower = true;
-
 		public bool powerAvailable = true;
-
 		[AVOID_SaveValue("consumeResource")]
 		protected VOID_SaveValue<bool> consumeResource = false;
-
 		[AVOID_SaveValue("resourceName")]
 		protected VOID_SaveValue<string> resourceName = "ElectricCharge";
-
 		[AVOID_SaveValue("resourceRate")]
 		protected VOID_SaveValue<float> resourceRate = 0.2f;
-
 		[AVOID_SaveValue("updatePeriod")]
-		protected VOID_SaveValue<double> _updatePeriod = 1001f/15000f;
+		protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
 		protected float _updateTimer = 0f;
 		protected string stringFrequency;
-
 		// Celestial Body Housekeeping
 		protected List<CelestialBody> _allBodies = new List<CelestialBody>();
 		protected bool bodiesLoaded = false;
-
 		// Vessel Type Housekeeping
 		protected List<VesselType> _allVesselTypes = new List<VesselType>();
 		protected bool vesselTypesLoaded = false;
-
 		public float saveTimer = 0;
-
+		protected string defaultSkin = "KSP window 2";
 		[AVOID_SaveValue("defaultSkin")]
-		protected VOID_SaveValue<string> defaultSkin = "KSP window 2";
-		protected int _skinIdx = int.MinValue;
-		protected List<GUISkin> skin_list;
+		protected VOID_SaveValue<string> _skinName;
+		protected Dictionary<string, GUISkin> skin_list;
+		protected List<string> skinNames;
 		protected string[] forbiddenSkins =
-		{
-			"PlaqueDialogSkin",
-			"FlagBrowserSkin",
-			"SSUITextAreaDefault",
-			"ExperimentsDialogSkin",
-			"ExpRecoveryDialogSkin",
-			"KSP window 5",
-			"KSP window 6"
-		};
+			{
+				"PlaqueDialogSkin",
+				"FlagBrowserSkin",
+				"SSUITextAreaDefault",
+				"ExperimentsDialogSkin",
+				"ExpRecoveryDialogSkin",
+				"KSP window 5",
+				"KSP window 6",
+				"PartTooltipSkin"
+			};
 		protected bool skinsLoaded = false;
-
 		public bool configDirty;
-
+		[AVOID_SaveValue("UseBlizzyToolbar")]
+		protected VOID_SaveValue<bool> _UseToolbarManager;
+		protected bool ToolbarManagerLoaded;
+		internal ToolbarButtonWrapper ToolbarButton;
 		/*
 		 * Properties
 		 * */
@@ -176,11 +161,11 @@
 		{
 			get
 			{
-				if (this.skin_list == null || this._skinIdx < 0 || this._skinIdx > this.skin_list.Count)
+				if (!this.skinsLoaded || this._skinName == null)
 				{
 					return AssetBase.GetGUISkin(this.defaultSkin);
 				}
-				return this.skin_list[this._skinIdx];
+				return this.skin_list[this._skinName];
 			}
 		}
 
@@ -190,7 +175,7 @@
 			{
 				if (this._windowID == 0)
 				{
-				this._windowID = this.windowBaseID;
+					this._windowID = this.windowBaseID;
 				}
 				return this._windowID++;
 			}
@@ -236,6 +221,27 @@
 			}
 		}
 
+		protected bool UseToolbarManager
+		{
+			get
+			{
+				return _UseToolbarManager;
+			}
+			set
+			{
+				if (value == false && this.ToolbarManagerLoaded && this.ToolbarButton != null)
+				{
+					this.ToolbarButton.Destroy();
+					this.ToolbarButton = null;
+				}
+				if (value == true && this.ToolbarManagerLoaded && this.ToolbarButton == null)
+				{
+					this.InitializeToolbarButton();
+				}
+
+				_UseToolbarManager.value = value;
+			}
+		}
 		/*
 		 * Methods
 		 * */
@@ -243,43 +249,47 @@
 		{
 			this._Name = "VOID Core";
 
-			this._Active = true;
-
-			this.VOIDIconOn = GameDatabase.Instance.GetTexture (this.VOIDIconOnPath, false);
-			this.VOIDIconOff = GameDatabase.Instance.GetTexture (this.VOIDIconOffPath, false);
-
-			this.LoadConfig ();
+			this._Active.value = true;
+
+			this.VOIDIconOn = GameDatabase.Instance.GetTexture(this.VOIDIconOnPath, false);
+			this.VOIDIconOff = GameDatabase.Instance.GetTexture(this.VOIDIconOffPath, false);
+
+			this._skinName = this.defaultSkin;
+
+			this.UseToolbarManager = false;
+			this.ToolbarManagerLoaded = false;
+
+			this.LoadConfig();
 		}
 
 		protected void LoadModulesOfType<T>()
 		{
 			var types = AssemblyLoader.loadedAssemblies
-				.Select (a => a.assembly.GetExportedTypes ())
-					.SelectMany (t => t)
-					.Where (v => typeof(T).IsAssignableFrom (v)
-					        && !(v.IsInterface || v.IsAbstract) &&
-					        !typeof(VOID_Core).IsAssignableFrom (v)
-					        );
-
-			Tools.PostDebugMessage (string.Format (
+				.Select(a => a.assembly.GetExportedTypes())
+					.SelectMany(t => t)
+					.Where(v => typeof(T).IsAssignableFrom(v)
+			            && !(v.IsInterface || v.IsAbstract) &&
+			            !typeof(VOID_Core).IsAssignableFrom(v)
+			            );
+
+			Tools.PostDebugMessage(string.Format(
 				"{0}: Found {1} modules to check.",
-				this.GetType ().Name,
-				types.Count ()
+				this.GetType().Name,
+				types.Count()
+			));
+			foreach (var voidType in types)
+			{
+				if (!HighLogic.LoadedSceneIsEditor &&
+				    typeof(IVOID_EditorModule).IsAssignableFrom(voidType))
+				{
+					continue;
+				}
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: found Type {1}",
+					this.GetType().Name,
+					voidType.Name
 				));
-			foreach (var voidType in types)
-			{
-				if (!HighLogic.LoadedSceneIsEditor &&
-				    typeof(IVOID_EditorModule).IsAssignableFrom(voidType)
-				    )
-				{
-					continue;
-				}
-
-				Tools.PostDebugMessage (string.Format (
-					"{0}: found Type {1}",
-					this.GetType ().Name,
-					voidType.Name
-					));
 
 				this.LoadModule(voidType);
 			}
@@ -295,7 +305,7 @@
 
 		protected void LoadModule(Type T)
 		{
-			var existingModules = this._modules.Where (mod => mod.GetType ().Name == T.Name);
+			var existingModules = this._modules.Where(mod => mod.GetType().Name == T.Name);
 			if (existingModules.Any())
 			{
 				Tools.PostDebugMessage(string.Format(
@@ -305,9 +315,9 @@
 				));
 				return;
 			}
-			IVOID_Module module = Activator.CreateInstance (T) as IVOID_Module;
+			IVOID_Module module = Activator.CreateInstance(T) as IVOID_Module;
 			module.LoadConfig();
-			this._modules.Add (module);
+			this._modules.Add(module);
 
 			Tools.PostDebugMessage(string.Format(
 				"{0}: loaded module {1}.",
@@ -316,97 +326,22 @@
 			));
 		}
 
-		protected void Preload_BeforeUpdate()
-		{
-			if (!this.bodiesLoaded)
-			{
-				this.LoadAllBodies();
-			}
-
-			if (!this.vesselTypesLoaded)
-			{
-				this.LoadVesselTypes();
-			}
-		}
-
-		public void Update()
-		{
-			this.Preload_BeforeUpdate ();
-
-			if (this.vessel != null)
-			{
-				SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-					Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
-				SimManager.Instance.TryStartSimulation();
-			}
-
-			if (!this.guiRunning)
-			{
-				this.StartGUI ();
-			}
-
-			if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
-			{
-				this.StopGUI ();
-			}
-
-			foreach (IVOID_Module module in this.Modules)
-			{
-				if (!module.guiRunning && module.toggleActive)
-				{
-					module.StartGUI ();
-				}
-				if (module.guiRunning && !module.toggleActive ||
-				    !this.togglePower ||
-				    !HighLogic.LoadedSceneIsFlight ||
-				    this.factoryReset
-				    )
-				{
-					module.StopGUI();
-				}
-
-				if (module is IVOID_BehaviorModule)
-				{
-					((IVOID_BehaviorModule)module).Update();
-				}
-			}
-
-			this.CheckAndSave ();
-			this._updateTimer += Time.deltaTime;
-		}
-
-		public void FixedUpdate()
-		{
-			if (this.consumeResource &&
-			    this.vessel.vesselType != VesselType.EVA &&
-			    TimeWarp.deltaTime != 0
-			    )
-			{
-				float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
-				                                                          this.resourceRate * TimeWarp.fixedDeltaTime);
-				if (powerReceived > 0)
-				{
-					this.powerAvailable = true;
-				}
-				else
-				{
-					this.powerAvailable = false;
-				}
-			}
-
-			foreach (IVOID_BehaviorModule module in
-			         this._modules.OfType<IVOID_BehaviorModule>().Where(m => !m.GetType().IsAbstract))
-			{
-				module.FixedUpdate();
-			}
-		}
-
 		protected void LoadSkins()
 		{
-			this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
+			Tools.PostDebugMessage("AssetBase has skins: \n" +
+			string.Join("\n\t",
+				Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+			            .Select(s => s.ToString())
+			            .ToArray()
+			)
+			);
+
+			this.skin_list = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
 				.Where(s => !this.forbiddenSkins.Contains(s.name))
 					.Select(s => s as GUISkin)
-					.ToList();
+					.GroupBy(s => s.name)
+					.Select(g => g.First())
+					.ToDictionary(s => s.name);
 
 			Tools.PostDebugMessage(string.Format(
 				"{0}: loaded {1} GUISkins.",
@@ -414,20 +349,23 @@
 				this.skin_list.Count
 			));
 
-			if (this._skinIdx == int.MinValue)
-			{
-				this._skinIdx = this.skin_list.IndexOf(this.Skin);
+			this.skinNames = this.skin_list.Keys.ToList();
+			this.skinNames.Sort();
+
+			if (this._skinName == null || !this.skinNames.Contains(this._skinName))
+			{
+				this._skinName = this.defaultSkin;
 				Tools.PostDebugMessage(string.Format(
 					"{0}: resetting _skinIdx to default.",
 					this.GetType().Name
-					));
+				));
 			}
 
 			Tools.PostDebugMessage(string.Format(
 				"{0}: _skinIdx = {1}.",
 				this.GetType().Name,
-				this._skinIdx.ToString()
-				));
+				this._skinName.ToString()
+			));
 
 			this.skinsLoaded = true;
 		}
@@ -450,14 +388,20 @@
 			this.LabelStyles["right"].normal.textColor = Color.white;
 			this.LabelStyles["right"].alignment = TextAnchor.UpperRight;
 
-			this.LabelStyles ["red"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles ["red"].normal.textColor = Color.red;
-			this.LabelStyles ["red"].alignment = TextAnchor.MiddleCenter;
+			this.LabelStyles["red"] = new GUIStyle(GUI.skin.label);
+			this.LabelStyles["red"].normal.textColor = Color.red;
+			this.LabelStyles["red"].alignment = TextAnchor.MiddleCenter;
+
+			this.iconStyle = new GUIStyle(GUI.skin.button);
+			this.iconStyle.padding = new RectOffset(0, 0, 0, 0);
+			// this.iconStyle.margin = new RectOffset(0, 0, 0, 0);
+			// this.iconStyle.contentOffset = new Vector2(0, 0);
+			this.iconStyle.overflow = new RectOffset(0, 0, 0, 0);
+			// this.iconStyle.border = new RectOffset(0, 0, 0, 0);
 
 			this.GUIStylesLoaded = true;
 		}
 
-		
 		protected void LoadAllBodies()
 		{
 			this._allBodies = FlightGlobals.Bodies;
@@ -470,26 +414,45 @@
 			this.vesselTypesLoaded = true;
 		}
 
-		protected void CheckAndSave()
-		{
-			this.saveTimer += Time.deltaTime;
-
-			if (this.saveTimer > 2f)
-			{
-				Tools.PostDebugMessage (string.Format (
-					"{0}: Time to save, checking if configDirty: {1}",
-					this.GetType ().Name,
-					this.configDirty
-					));
-
-				if (!this.configDirty)
-				{
-					return;
-				}
-
-				this.SaveConfig ();
-				this.saveTimer = 0;
-			}
+		protected void LoadBeforeUpdate()
+		{
+			if (!this.bodiesLoaded)
+			{
+				this.LoadAllBodies();
+			}
+
+			if (!this.vesselTypesLoaded)
+			{
+				this.LoadVesselTypes();
+			}
+		}
+
+		protected void LoadToolbarManager()
+		{
+			this.ToolbarManagerLoaded = ToolbarButtonWrapper.ToolbarManagerPresent;
+
+			if (this.ToolbarManagerLoaded)
+			{
+				this.InitializeToolbarButton();
+			}
+		}
+
+		protected void InitializeToolbarButton()
+		{
+			this.ToolbarButton = ToolbarButtonWrapper.TryWrapToolbarButton(this.GetType().Name, "coreToggle");
+			this.ToolbarButton.Text = this.VoidName;
+			this.ToolbarButton.TexturePath = this.VOIDIconOffPath;
+			if (this is VOID_EditorCore)
+			{
+				this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.EDITOR });
+			}
+			else
+			{
+				this.ToolbarButton.SetButtonVisibility(new GameScenes[] { GameScenes.FLIGHT });
+			}
+			this.ToolbarButton.AddButtonClickHandler(
+				(e) => this.mainGuiMinimized = !this.mainGuiMinimized
+			);
 		}
 
 		public void VOIDMainWindow(int _)
@@ -501,24 +464,26 @@
 				if (!HighLogic.LoadedSceneIsEditor)
 				{
 					string str = "ON";
-					if (togglePower) str = "OFF";
-					if (GUILayout.Button("Power " + str)) togglePower = !togglePower;
+					if (togglePower)
+						str = "OFF";
+					if (GUILayout.Button("Power " + str))
+						togglePower.value = !togglePower;
 				}
 
 				if (togglePower || HighLogic.LoadedSceneIsEditor)
-			    {
+				{
 					foreach (IVOID_Module module in this.Modules)
 					{
-						module.toggleActive = GUILayout.Toggle (module.toggleActive, module.Name);
+						module.toggleActive = GUILayout.Toggle(module.toggleActive, module.Name);
 					}
-			    }
+				}
 			}
 			else
 			{
-			    GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
-			}
-
-			this.configWindowMinimized = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
+				GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
+			}
+
+			this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
 
 			GUILayout.EndVertical();
 			GUI.DragWindow();
@@ -526,45 +491,65 @@
 
 		public void VOIDConfigWindow(int _)
 		{
-			GUILayout.BeginVertical ();
-
-			this.DrawConfigurables ();
-
-			GUILayout.EndVertical ();
-			GUI.DragWindow ();
+			GUILayout.BeginVertical();
+
+			this.DrawConfigurables();
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
 		}
 
 		public override void DrawConfigurables()
 		{
+			int skinIdx;
+
+			GUIContent _content;
+
 			if (HighLogic.LoadedSceneIsFlight)
 			{
-				this.consumeResource = GUILayout.Toggle (this.consumeResource, "Consume Resources");
-
-				this.VOIDIconLocked = GUILayout.Toggle (this.VOIDIconLocked, "Lock Icon Position");
-			}
+				this.consumeResource.value = GUILayout.Toggle(this.consumeResource, "Consume Resources");
+
+				this.VOIDIconLocked = GUILayout.Toggle(this.VOIDIconLocked, "Lock Icon Position");
+			}
+
+			this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 
 			GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
 
-			GUIContent _content = new GUIContent();
+			_content = new GUIContent();
+
+			if (skinNames.Contains(this._skinName))
+			{
+				skinIdx = skinNames.IndexOf(this._skinName);
+			}
+			else if (skinNames.Contains(this.defaultSkin))
+			{
+				skinIdx = skinNames.IndexOf(this.defaultSkin);
+			}
+			else
+			{
+				skinIdx = 0;
+			}
 
 			_content.text = "◄";
 			_content.tooltip = "Select previous skin";
 			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
 			{
-				this._skinIdx--;
-				if (this._skinIdx < 0) this._skinIdx = skin_list.Count - 1;
-				Tools.PostDebugMessage (string.Format (
+				this.GUIStylesLoaded = false;
+				skinIdx--;
+				if (skinIdx < 0)
+					skinIdx = skinNames.Count - 1;
+				Tools.PostDebugMessage(string.Format(
 					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
 					this.GetType().Name,
-					this._skinIdx,
+					this._skinName,
 					this.skin_list.Count
 				));
 			}
 
-			string skin_name = skin_list[this._skinIdx].name;
-			_content.text = skin_name;
+			_content.text = this.Skin.name;
 			_content.tooltip = "Current skin";
 			GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
 
@@ -572,19 +557,21 @@
 			_content.tooltip = "Select next skin";
 			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
 			{
-				this._skinIdx++;
-				if (this._skinIdx >= skin_list.Count) this._skinIdx = 0;
-				Tools.PostDebugMessage (string.Format (
+				this.GUIStylesLoaded = false;
+				skinIdx++;
+				if (skinIdx >= skinNames.Count)
+					skinIdx = 0;
+				Tools.PostDebugMessage(string.Format(
 					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
 					this.GetType().Name,
-					this._skinIdx,
+					this._skinName,
 					this.skin_list.Count
-					));
-			}
-
-			if (this.Skin.name != this.defaultSkin)
-			{
-				this.defaultSkin = this.Skin.name;
+				));
+			}
+
+			if (this._skinName != skinNames[skinIdx])
+			{
+				this._skinName = skinNames[skinIdx];
 			}
 
 			GUILayout.EndHorizontal();
@@ -607,10 +594,99 @@
 
 			foreach (IVOID_Module mod in this.Modules)
 			{
-				mod.DrawConfigurables ();
-			}
-
-			this._factoryReset = GUILayout.Toggle (this._factoryReset, "Factory Reset");
+				mod.DrawConfigurables();
+			}
+
+			this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
+		}
+
+		public override void DrawGUI()
+		{
+			this._windowID = this.windowBaseID;
+
+			if (!this._modulesLoaded)
+			{
+				this.LoadModulesOfType<IVOID_Module>();
+			}
+
+			if (this.UseToolbarManager && !this.ToolbarManagerLoaded)
+			{
+				this.LoadToolbarManager();
+			}
+
+			if (!this.skinsLoaded)
+			{
+				this.LoadSkins();
+			}
+
+			GUI.skin = this.Skin;
+
+			if (!this.GUIStylesLoaded)
+			{
+				this.LoadGUIStyles();
+			}
+
+			if (this.UseToolbarManager && this.ToolbarManagerLoaded)
+			{
+				this.ToolbarButton.TexturePath = VOIDIconOffPath;
+				if (this.togglePower)
+				{
+					this.ToolbarButton.TexturePath = VOIDIconOnPath;
+				}
+			}
+			else
+			{
+				this.VOIDIconTexture = this.VOIDIconOff;  //icon off default
+				if (this.togglePower)
+					this.VOIDIconTexture = this.VOIDIconOn;     //or on if power_toggle==true
+
+				if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
+				{
+					this.mainGuiMinimized.value = !this.mainGuiMinimized;
+				}
+			}
+
+			if (!this.mainGuiMinimized)
+			{
+				Rect _mainWindowPos = this.mainWindowPos;
+
+				_mainWindowPos = GUILayout.Window(
+					this.windowID,
+					_mainWindowPos,
+					this.VOIDMainWindow,
+					string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
+					GUILayout.Width(250),
+					GUILayout.Height(50)
+				);
+
+				_mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
+
+				if (_mainWindowPos != this.mainWindowPos)
+				{
+					this.mainWindowPos = _mainWindowPos;
+				}
+			}
+
+			if (!this.configWindowMinimized && !this.mainGuiMinimized)
+			{
+				Rect _configWindowPos = this.configWindowPos;
+
+				_configWindowPos = GUILayout.Window(
+					this.windowID,
+					_configWindowPos,
+					this.VOIDConfigWindow,
+					string.Join(" ", new string[] { this.VoidName, "Configuration" }),
+					GUILayout.Width(250),
+					GUILayout.Height(50)
+				);
+
+				_configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
+
+				if (_configWindowPos != this.configWindowPos)
+				{
+					this.configWindowPos = _configWindowPos;
+				}
+			}
 		}
 
 		public void OnGUI()
@@ -638,8 +714,7 @@
 
 			if (!this.VOIDIconLocked &&
 			    VOIDIconPos.value.Contains(Event.current.mousePosition)
-			    && Event.current.type == EventType.mouseDrag
-			    )
+			    && Event.current.type == EventType.mouseDrag)
 			{
 				Tools.PostDebugMessage(string.Format(
 					"Event.current.type: {0}" +
@@ -668,110 +743,131 @@
 			}
 		}
 
-		public override void DrawGUI()
-		{
-			if (!this._modulesLoaded)
-			{
-				this.LoadModulesOfType<IVOID_Module> ();
-			}
-
-			this._windowID = this.windowBaseID;
-
-			if (!this.skinsLoaded)
-			{
-				this.LoadSkins();
-			}
-
-			GUI.skin = this.Skin;
-
-			if (!this.GUIStylesLoaded)
-			{
-				this.LoadGUIStyles ();
-			}
-
-			this.VOIDIconTexture = this.VOIDIconOff;  //icon off default
-			if (this.togglePower) this.VOIDIconTexture = this.VOIDIconOn;     //or on if power_toggle==true
-			if (GUI.Button(VOIDIconPos, VOIDIconTexture) && this.VOIDIconLocked)
-			{
-				this.mainGuiMinimized = !this.mainGuiMinimized;
-			}
-
-			if (!this.mainGuiMinimized)
-			{
-				Rect _mainWindowPos = this.mainWindowPos;
-
-				_mainWindowPos = GUILayout.Window (
-					this.windowID,
-					_mainWindowPos,
-					this.VOIDMainWindow,
-					string.Join (" ", new string[] {this.VoidName, this.VoidVersion}),
-					GUILayout.Width (250),
-					GUILayout.Height (50)
-				);
-
-				_mainWindowPos = Tools.ClampRectToScreen (_mainWindowPos);
-
-				if (_mainWindowPos != this.mainWindowPos)
-				{
-					this.mainWindowPos = _mainWindowPos;
-				}
-			}
-
-			if (!this.configWindowMinimized && !this.mainGuiMinimized)
-			{
-				Rect _configWindowPos = this.configWindowPos;
-
-				_configWindowPos = GUILayout.Window (
-					this.windowID,
-					_configWindowPos,
-					this.VOIDConfigWindow,
-					string.Join (" ", new string[] {this.VoidName, "Configuration"}),
-					GUILayout.Width (250),
-					GUILayout.Height (50)
-				);
-
-				_configWindowPos = Tools.ClampRectToScreen (_configWindowPos);
-
-				if (_configWindowPos != this.configWindowPos)
-				{
-					this.configWindowPos = _configWindowPos;
-				}
+		public void Update()
+		{
+			this.LoadBeforeUpdate();
+
+			if (this.vessel != null)
+			{
+				SimManager.Instance.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+				Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+				SimManager.Instance.TryStartSimulation();
+			}
+
+			if (!this.guiRunning)
+			{
+				this.StartGUI();
+			}
+
+			if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
+			{
+				this.StopGUI();
+			}
+
+			foreach (IVOID_Module module in this.Modules)
+			{
+				if (!module.guiRunning && module.toggleActive)
+				{
+					module.StartGUI();
+				}
+				if (module.guiRunning && !module.toggleActive ||
+				    !this.togglePower ||
+				    !HighLogic.LoadedSceneIsFlight ||
+				    this.factoryReset)
+				{
+					module.StopGUI();
+				}
+
+				if (module is IVOID_BehaviorModule)
+				{
+					((IVOID_BehaviorModule)module).Update();
+				}
+			}
+
+			this.CheckAndSave();
+			this._updateTimer += Time.deltaTime;
+		}
+
+		public void FixedUpdate()
+		{
+			if (this.consumeResource &&
+			    this.vessel.vesselType != VesselType.EVA &&
+			    TimeWarp.deltaTime != 0)
+			{
+				float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
+					                      this.resourceRate * TimeWarp.fixedDeltaTime);
+				if (powerReceived > 0)
+				{
+					this.powerAvailable = true;
+				}
+				else
+				{
+					this.powerAvailable = false;
+				}
+			}
+
+			foreach (IVOID_BehaviorModule module in
+			         this._modules.OfType<IVOID_BehaviorModule>().Where(m => !m.GetType().IsAbstract))
+			{
+				module.FixedUpdate();
 			}
 		}
 
 		public void ResetGUI()
 		{
-			this.StopGUI ();
+			this.StopGUI();
 
 			foreach (IVOID_Module module in this.Modules)
 			{
-				module.StopGUI ();
-				module.StartGUI ();
-			}
-
-			this.StartGUI ();
+				module.StopGUI();
+				module.StartGUI();
+			}
+
+			this.StartGUI();
+		}
+
+		protected void CheckAndSave()
+		{
+			this.saveTimer += Time.deltaTime;
+
+			if (this.saveTimer > 2f)
+			{
+				if (!this.configDirty)
+				{
+					return;
+				}
+
+				Tools.PostDebugMessage(string.Format(
+					"{0}: Time to save, checking if configDirty: {1}",
+					this.GetType().Name,
+					this.configDirty
+				));
+
+				this.SaveConfig();
+				this.saveTimer = 0;
+			}
 		}
 
 		public override void LoadConfig()
 		{
-			base.LoadConfig ();
+			base.LoadConfig();
 
 			foreach (IVOID_Module module in this.Modules)
 			{
-				module.LoadConfig ();
+				module.LoadConfig();
 			}
 		}
 
 		public void SaveConfig()
 		{
-			var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core> ();
-			config.load ();
+			var config = KSP.IO.PluginConfiguration.CreateForType<VOID_Core>();
+			config.load();
 
 			this._SaveToConfig(config);
 
 			foreach (IVOID_Module module in this.Modules)
 			{
-				module._SaveToConfig (config);
+				module._SaveToConfig(config);
 			}
 
 			config.save();

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -30,19 +30,19 @@
 		/*
 		 * Fields
 		 * */
-		protected bool stopwatch1_running = false;
-
-		protected bool csv_logging = false;
-		protected bool first_write = true;
-
-		protected double stopwatch1 = 0;
-
-		protected string csv_log_interval_str = "0.5";
+		protected bool stopwatch1_running;
+
+		protected bool csv_logging;
+		protected bool first_write;
+
+		protected double stopwatch1;
+
+		protected string csv_log_interval_str;
 
 		protected float csv_log_interval;
 
-		protected double csvWriteTimer = 0;
-		protected double csvCollectTimer = 0;
+		protected double csvWriteTimer;
+		protected double csvCollectTimer;
 
 		protected List<string> csvList = new List<string>();
 
@@ -57,6 +57,17 @@
 		public VOID_DataLogger()
 		{
 			this._Name = "CSV Data Logger";
+
+			this.stopwatch1_running = false;
+
+			this.csv_logging = false;
+			this.first_write = true;
+
+			this.stopwatch1 = 0;
+			this.csv_log_interval_str = "0.5";
+
+			this.csvWriteTimer = 0;
+			this.csvCollectTimer = 0;
 
 			this.WindowPos.x = Screen.width - 520;
 			this.WindowPos.y = 85;

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -149,7 +149,7 @@
 			}
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label(this.Label + " (P" + digits + "):", GUILayout.ExpandWidth(true));
+			GUILayout.Label(this.Label + ":", GUILayout.ExpandWidth(true));
 			GUILayout.FlexibleSpace();
 			GUILayout.Label(this.ValueUnitString(digits), GUILayout.ExpandWidth(false));
 			GUILayout.EndHorizontal();

--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -24,6 +24,8 @@
 using KSP;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
 using UnityEngine;
 
 namespace VOID
@@ -40,6 +42,8 @@
 
 		protected GUIStyle labelStyle;
 
+		protected EditorVesselOverlays _vesselOverlays;
+
 		/*
 		 * Properties
 		 * */
@@ -61,6 +65,47 @@
 			}
 		}
 
+		protected EditorVesselOverlays vesselOverlays
+		{
+			get
+			{
+				if (this._vesselOverlays == null)
+				{
+					this._vesselOverlays = (EditorVesselOverlays)Resources
+						.FindObjectsOfTypeAll(typeof(EditorVesselOverlays))
+						.FirstOrDefault();
+				}
+
+				return this._vesselOverlays;
+			}
+		}
+
+		protected EditorMarker_CoM CoMmarker
+		{
+			get
+			{
+				if (this.vesselOverlays == null)
+				{
+					return null;
+				}
+
+				return this.vesselOverlays.CoMmarker;
+			}
+		}
+
+		protected EditorMarker_CoT CoTmarker
+		{
+			get
+			{
+				if (this.vesselOverlays == null)
+				{
+					return null;
+				}
+
+				return this.vesselOverlays.CoTmarker;
+			}
+		}
+
 		/* 
 		 * Methods
 		 * */
@@ -68,7 +113,7 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active = true;
+			this._Active.value = true;
 
 			this.textColors.Add(Color.green);
 			this.textColors.Add(Color.black);
@@ -97,6 +142,7 @@
 			}
 
 			float hudLeft;
+			StringBuilder hudString;
 
 			if (EditorLogic.fetch.editorScreen == EditorLogic.EditorScreen.Parts)
 			{
@@ -113,17 +159,53 @@
 
 			Rect hudPos = new Rect (hudLeft, 48, 300, 32);
 
+			hudString = new StringBuilder();
+
 			// GUI.skin = AssetBase.GetGUISkin("KSP window 2");
 
 			labelStyle.normal.textColor = textColors [ColorIndex];
+
+			hudString.Append("Total Mass: ");
+			hudString.Append(SimManager.Instance.LastStage.totalMass.ToString("F3"));
+			hudString.Append('t');
+
+			hudString.Append(' ');
+
+			hudString.Append("Part Count: ");
+			hudString.Append(EditorLogic.SortedShipList.Count);
+
+			hudString.Append('\n');
+
+			hudString.Append("Total Delta-V: ");
+			hudString.Append(Tools.MuMech_ToSI(SimManager.Instance.LastStage.totalDeltaV));
+			hudString.Append("m/s");
+
+			hudString.Append('\n');
+
+			hudString.Append("Bottom Stage Delta-V");
+			hudString.Append(Tools.MuMech_ToSI(SimManager.Instance.LastStage.deltaV));
+			hudString.Append("m/s");
+
+			hudString.Append('\n');
+
+			hudString.Append("Bottom Stage T/W Ratio: ");
+			hudString.Append(SimManager.Instance.LastStage.thrustToWeight.ToString("F3"));
+
+			if (this.CoMmarker.gameObject.activeInHierarchy && this.CoTmarker.gameObject.activeInHierarchy)
+			{
+				hudString.Append('\n');
+
+				hudString.Append("Thrust Offset: ");
+				hudString.Append(
+					Vector3.Cross(
+						this.CoTmarker.dirMarkerObject.transform.forward,
+						this.CoMmarker.posMarkerObject.transform.position - this.CoTmarker.posMarkerObject.transform.position
+					).ToString("F3"));
+			}
 
 			GUI.Label (
 				hudPos,
-				"Total Mass: " + SimManager.Instance.LastStage.totalMass.ToString("F3") + "t" +
-				" Part Count: " + EditorLogic.SortedShipList.Count +
-				"\nTotal Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.totalDeltaV) + "m/s" +
-				"\nBottom Stage Delta-V: " + Tools.MuMech_ToSI(SimManager.Instance.LastStage.deltaV) + "m/s" +
-				"\nBottom Stage T/W Ratio: " + SimManager.Instance.LastStage.thrustToWeight.ToString("F3"),
+				hudString.ToString(),
 				labelStyle);
 		}
 

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -65,7 +65,7 @@
 		{
 			this._Name = "Heads-Up Display";
 
-			this._Active = true;
+			this._Active.value = true;
 
 			this.textColors.Add(Color.green);
 			this.textColors.Add(Color.black);
@@ -113,7 +113,8 @@
 					" Lon: " + Tools.GetLongitudeString (vessel, "F3") +
 					"\nHdg: " + Tools.MuMech_get_heading (vessel).ToString ("F2") + "° " +
 					Tools.get_heading_text (Tools.MuMech_get_heading (vessel)) +
-					"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name,
+					"\nBiome: " + Tools.Toadicus_GetAtt (vessel).name +
+					" Sit: " + vessel.GetExperimentSituation().HumanString(),
 					VOID_Core.Instance.LabelStyles["hud"]);
 			}
 			else

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -50,7 +50,7 @@
 			}
 			set
 			{
-				this._Active = value;
+				this._Active.value = value;
 			}
 		}
 
@@ -130,6 +130,8 @@
 
 				string fieldName = string.Format("{0}_{1}", this.GetType().Name, attr.Name);
 
+				Tools.PostDebugMessage(string.Format("{0}: Loading field {1}.", this.GetType().Name, fieldName));
+
 				object fieldValue = field.GetValue(this);
 
 				bool convertBack = false;
@@ -198,23 +200,13 @@
 		public virtual void ModuleWindow(int _)
 		{
 			if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
-				Tools.PostDebugMessage(string.Format(
-					"{0}: refreshing VOID_DataValues.",
-					this.GetType().Name
-				));
-
 				foreach (var fieldinfo in this.GetType().GetFields(
 					BindingFlags.Instance |
 					BindingFlags.NonPublic |
 					BindingFlags.Public |
 					BindingFlags.FlattenHierarchy
-				)) {
-					Tools.PostDebugMessage(string.Format(
-						"{0}: checking field {1}.",
-						this.GetType().Name,
-						fieldinfo.Name
-					));
-
+				))
+				{
 					object field = null;
 
 					try
@@ -234,19 +226,7 @@
 					}
 
 					if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
-						Tools.PostDebugMessage(string.Format(
-							"{0}: found field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-
 						(field as IVOID_DataValue).Refresh ();
-
-						Tools.PostDebugMessage(string.Format(
-							"{0}: refreshed field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
 					}
 				}
 
@@ -256,6 +236,8 @@
 
 		public override void DrawGUI()
 		{
+			GUI.skin = VOID_Core.Instance.Skin;
+
 			Rect _Pos = this.WindowPos;
 
 			_Pos = GUILayout.Window(

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -68,7 +68,7 @@
 		);
 
 		protected VOID_StrValue timeToPeri = new VOID_StrValue(
-			"Time to Apoapsis",
+			"Time to Periapsis",
 			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
 		);
 
@@ -183,7 +183,7 @@
 			this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
 			idx++;
 
-			this.toggleExtended = GUILayout.Toggle(this.toggleExtended, "Extended info");
+			this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
 
 			if (this.toggleExtended)
             {

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -114,7 +114,7 @@
 				}
 			}
 
-			untoggleRegisterInfo = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
+			untoggleRegisterInfo.value = GUILayout.Toggle(untoggleRegisterInfo, "Hide Vessel Register Info");
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(" ", GUILayout.ExpandWidth(true));
@@ -138,7 +138,7 @@
 				{
 					// Toadicus edit: added local sidereal longitude.
 					// Toadicus edit: added local sidereal longitude.
-					double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
+					double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
 					LSL = Tools.FixDegreeDomain (LSL);
 
 					//display orbital info for orbiting/flying/suborbital/escaping vessels only

--- a/VOID_SaveValue.cs
+++ b/VOID_SaveValue.cs
@@ -30,6 +30,28 @@
 		private T _value;
 		private Type _type;
 
+		private VOID_Core Core
+		{
+			get
+			{
+				if (HighLogic.LoadedSceneIsEditor)
+				{
+					if (VOID_EditorCore.Initialized)
+					{
+						return VOID_EditorCore.Instance;
+					}
+				}
+				else if (HighLogic.LoadedSceneIsFlight)
+				{
+					if (VOID_Core.Initialized)
+					{
+						return VOID_Core.Instance;
+					}
+				}
+				return null;
+			}
+		}
+
 		public T value
 		{
 			get
@@ -38,6 +60,20 @@
 			}
 			set
 			{
+				if (this.Core != null && !System.Object.Equals(this._value, value))
+				{
+					Tools.PostDebugMessage (string.Format (
+						"VOID: Dirtying config for type {0} in method {1}." +
+						"\n\t Old Value: {2}, New Value: {3}" +
+						"\n\t Object.Equals(New, Old): {4}",
+						this._type,
+						new System.Diagnostics.StackTrace().GetFrame(1).GetMethod(),
+						this._value,
+						value,
+						System.Object.Equals(this._value, value)
+					));
+					this.Core.configDirty = true;
+				}
 				this._value = value;
 			}
 		}
@@ -46,6 +82,10 @@
 		{
 			get
 			{
+				if (this._type == null && this._value != null)
+				{
+					this._type = this._value.GetType ();
+				}
 				return this._type;
 			}
 			set
@@ -64,7 +104,7 @@
 
 		public void SetValue(object v)
 		{
-			this._value = (T)v;
+			this.value = (T)v;
 		}
 
 		public static implicit operator T(VOID_SaveValue<T> v)
@@ -75,18 +115,8 @@
 		public static implicit operator VOID_SaveValue<T>(T v)
 		{
 			VOID_SaveValue<T> r = new VOID_SaveValue<T>();
+			r.type = v.GetType();
 			r.value = v;
-			r.type = v.GetType();
-
-			if (VOID_Core.Initialized)
-			{
-				VOID_Core.Instance.configDirty = true;
-			}
-
-			if (VOID_EditorCore.Initialized)
-			{
-				VOID_EditorCore.Instance.configDirty = true;
-			}
 
 			return r;
 		}

--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -27,9 +27,6 @@
 {
 	public class VOID_Transfer : VOID_WindowModule
 	{
-		[AVOID_SaveValue("toggleExtended")]
-		protected VOID_SaveValue<bool> toggleExtended = false;
-
 		protected List<CelestialBody> selectedBodies = new List<CelestialBody>();
 
 		public VOID_Transfer()

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -23,14 +23,12 @@
 using System.Collections.Generic;
 using UnityEngine;
 using Engineer.VesselSimulator;
+using Engineer.Extensions;
 
 namespace VOID
 {
 	public class VOID_VesselInfo : VOID_WindowModule
 	{
-		[AVOID_SaveValue("toggleExtended")]
-		protected VOID_SaveValue<bool> toggleExtended = false;
-
 		protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
 			"G-force",
 			new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
@@ -154,6 +152,51 @@
 			""
 		);
 
+		protected VOID_StrValue intakeAirStatus = new VOID_StrValue(
+			"Intake Air (Curr / Req)",
+			delegate()
+			{
+				double currentAmount;
+				double currentRequirement;
+
+				currentAmount = 0d;
+				currentRequirement = 0d;
+
+				foreach (Part part in VOID_Core.Instance.vessel.Parts)
+				{
+					if (part.HasModule<ModuleEngines>() && part.enabled)
+					{
+						foreach (Propellant propellant in part.GetModule<ModuleEngines>().propellants)
+						{
+							if (propellant.name == "IntakeAir")
+							{
+								// currentAmount += propellant.currentAmount;
+								currentRequirement += propellant.currentRequirement / TimeWarp.fixedDeltaTime;
+								break;
+							}
+						}
+					}
+
+					if (part.HasModule<ModuleResourceIntake>() && part.enabled)
+					{
+						ModuleResourceIntake intakeModule = part.GetModule<ModuleResourceIntake>();
+
+						if (intakeModule.resourceName == "IntakeAir")
+						{
+							currentAmount += intakeModule.airFlow;
+						}
+					}
+				}
+
+				if (currentAmount == 0 && currentRequirement == 0)
+				{
+					return "N/A";
+				}
+
+				return string.Format("{0:F3} / {1:F3}", currentAmount, currentRequirement);
+			}
+		);
+
 		public VOID_VesselInfo() : base()
 		{
 			this._Name = "Vessel Information";
@@ -199,6 +242,8 @@
 			this.currmaxThrustWeight.DoGUIHorizontal ();
 
 			this.surfaceThrustWeight.DoGUIHorizontal ("F2");
+
+			this.intakeAirStatus.DoGUIHorizontal();
 
 			GUILayout.EndVertical();
 			GUI.DragWindow();

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -133,7 +133,7 @@
 							if (_selectedVessel != v)
 							{
 								_selectedVessel = v; //set clicked vessel as selected_vessel
-								this._Active = true;    //turn bool on to open the window if closed
+								this._Active.value = true;    //turn bool on to open the window if closed
 							}
 							else
 							{