Changes throughout to separate VOID_Tools from ToadicusTools.Tools. Good idea?
Changes throughout to separate VOID_Tools from ToadicusTools.Tools. Good idea?

--- a/IVOID_Module.cs
+++ b/IVOID_Module.cs
@@ -1,23 +1,31 @@
+// VOID
 //
-//  IVOID_Module.cs
+// IVOID_Module.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 
 namespace VOID

file:a/IntCollection.cs (deleted)
--- a/IntCollection.cs
+++ /dev/null
@@ -1,81 +1,1 @@
-//
-//  IntCollection.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;
 
-namespace VOID
-{
-	public class IntCollection
-	{
-		public static implicit operator long(IntCollection c)
-		{
-			return c.collection;
-		}
-
-		protected long mask;
-
-		public long collection { get; protected set; }
-		public ushort maxCount { get; protected set; }
-		public ushort wordLength { get; protected set; }
-
-		public IntCollection (ushort wordLength = 4, long initialCollection = 0)
-		{
-			this.collection = initialCollection;
-			this.wordLength = wordLength;
-			this.maxCount = (ushort)((sizeof(long) * 8 - 1) / wordLength);
-			this.mask = ((1 << this.wordLength) - 1);
-		}
-
-		public ushort this[int idx]
-		{
-			get {
-				if (idx < 0) {
-					idx += this.maxCount;
-				}
-
-				if (idx >= maxCount || idx < 0) {
-					throw new IndexOutOfRangeException ();
-				}
-
-				idx *= wordLength;
-
-				return (ushort)((this.collection & (this.mask << idx)) >> idx);
-			}
-			set {
-				if (idx < 0) {
-					idx += this.maxCount;
-				}
-
-				if (idx >= maxCount || idx < 0) {
-					throw new IndexOutOfRangeException ();
-				}
-
-				idx *= wordLength;
-
-				long packvalue = value & this.mask;
-
-				this.collection &= ~(this.mask << idx);
-				this.collection |= packvalue << idx;
-			}
-		}
-	}
-}
-
-

file:a/ToolbarButtonWrapper.cs (deleted)
--- a/ToolbarButtonWrapper.cs
+++ /dev/null
@@ -1,393 +1,1 @@
-//
-//  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 System.Type ToolbarManager;
-		protected object TBManagerInstance;
-		protected MethodInfo TBManagerAdd;
-		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 ButtonEnalbed;
-		protected PropertyInfo ButtonImportant;
-		protected EventInfo ButtonOnClick;
-		protected System.Type ClickHandlerType;
-		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 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>
-		public ToolbarButtonWrapper(string ns, string id)
-		{
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Loading ToolbarManager.",
-				this.GetType().Name
-			));
-
-			this.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.",
-				this.GetType().Name
-			));
-
-			this.TBManagerInstance = this.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.",
-				this.GetType().Name,
-				this.TBManagerInstance
-			));
-
-			this.TBManagerAdd = this.ToolbarManager.GetMethod("add");
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got ToolbarManager Instance 'add' method.  Loading IButton.",
-				this.GetType().Name
-			));
-
-			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.Button = this.TBManagerAdd.Invoke(this.TBManagerInstance, new object[] { ns, id });
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Added Button '{1}' with ToolbarManager.  Getting 'Text' property",
-				this.GetType().Name,
-				this.Button.ToString()
-			));
-
-			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 '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");
-			this.ClickHandlerType = this.ButtonOnClick.EventHandlerType;
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Got 'OnClick' 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)
-		{
-			Delegate d = Delegate.CreateDelegate(this.ClickHandlerType, Handler.Target, Handler.Method);
-			MethodInfo addHandler = this.ButtonOnClick.GetAddMethod();
-			addHandler.Invoke(this.Button, new object[] { d });
-		}
-
-		/// <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);
-		}
-	}
-}
-

file:a/Tools.cs (deleted)
--- a/Tools.cs
+++ /dev/null
@@ -1,976 +1,1 @@
-//
-//  Tools.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/>.
-//
-//  This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
-//  Engineer Redux (c) 2013 cybutek
-//  Used by permission.
-//
-///////////////////////////////////////////////////////////////////////////////
 
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace VOID
-{
-	public static class VOIDLabels
-	{
-		public static string void_primary = "Primary";
-		public static string void_altitude_asl = "Altitude (ASL)";
-		public static string void_velocity = "Velocity";
-		public static string void_apoapsis = "Apoapsis";
-		public static string void_periapsis = "Periapsis";
-	}
-
-	public static class Tools
-	{
-		// Toadicus edit: Added re-implementation of the CBAttributeMap.GetAtt function that does not fire a debug message to the game screen.
-		public static CBAttributeMap.MapAttribute Toadicus_GetAtt(Vessel vessel)
-		{
-			CBAttributeMap.MapAttribute mapAttribute;
-
-			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)
-				{
-					lon += 2d * Math.PI;
-				}
-
-				float v = (float)(lat / Math.PI) + 0.5f;
-				float u = (float)(lon / (2d * Math.PI));
-
-				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
-				mapAttribute = BiomeMap.defaultAttribute;
-
-				if (BiomeMap.Map != null)
-				{
-					if (BiomeMap.exactSearch)
-					{
-						for (int i = 0; i < BiomeMap.Attributes.Length; ++i)
-						{
-							if (pixelBilinear == BiomeMap.Attributes[i].mapColor)
-							{
-								mapAttribute = BiomeMap.Attributes[i];
-							}
-						}
-					}
-					else
-					{
-						float zero = 0;
-						float num = 1 / zero;
-						for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
-						{
-							Color mapColor = BiomeMap.Attributes[j].mapColor;
-							float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
-							if (sqrMagnitude < num)
-							{
-								bool testCase = true;
-								if (BiomeMap.nonExactThreshold != -1)
-								{
-									testCase = (sqrMagnitude < BiomeMap.nonExactThreshold);
-								}
-								if (testCase)
-								{
-									mapAttribute = BiomeMap.Attributes[j];
-									num = sqrMagnitude;
-								}
-							}
-						}
-					}
-				}
-				*/
-			}
-			catch (NullReferenceException)
-			{
-				mapAttribute = new CBAttributeMap.MapAttribute();
-				mapAttribute.name = "N/A";
-			}
-
-			return mapAttribute;
-		}
-
-		public static string GetLongitudeString(Vessel vessel, string format = "F4")
-		{
-			string dir_long = "W";
-			double v_long = vessel.longitude;
-
-			v_long = FixDegreeDomain(v_long);
-
-			if (v_long < -180d)
-			{
-				v_long += 360d;
-			}
-			if (v_long >= 180)
-			{
-				v_long -= 360d;
-			}
-
-			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")
-		{
-			string dir_lat = "S";
-			double v_lat = vessel.latitude;
-			if (v_lat > 0)
-				dir_lat = "N";
-
-			return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
-		}
-
-		///////////////////////////////////////////////////////////////////////////////
-
-		//For MuMech_get_heading()
-		public class MuMech_MovingAverage
-		{
-			private double[] store;
-			private int storeSize;
-			private int nextIndex = 0;
-
-			public double value
-			{
-				get
-				{
-					double tmp = 0;
-					foreach (double i in store)
-					{
-						tmp += i;
-					}
-					return tmp / storeSize;
-				}
-				set
-				{
-					store[nextIndex] = value;
-					nextIndex = (nextIndex + 1) % storeSize;
-				}
-			}
-
-			public MuMech_MovingAverage(int size = 10, double startingValue = 0)
-			{
-				storeSize = size;
-				store = new double[size];
-				force(startingValue);
-			}
-
-			public void force(double newValue)
-			{
-				for (int i = 0; i < storeSize; i++)
-				{
-					store[i] = newValue;
-				}
-			}
-
-			public static implicit operator double(MuMech_MovingAverage v)
-			{
-				return v.value;
-			}
-
-			public override string ToString()
-			{
-				return value.ToString();
-			}
-
-			public string ToString(string format)
-			{
-				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 up = (CoM - vessel.mainBody.position).normalized;
-			Vector3d north = Vector3d.Exclude(
-				                 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);
-
-			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
-		)
-		{
-			float exponent = (float)Math.Log10(Math.Abs(d));
-			exponent = Mathf.Clamp(exponent, (float)MinMagnitude, (float)MaxMagnitude);
-
-			if (exponent >= 0)
-			{
-				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";
-				}
-			}
-			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";
-				}
-			}
-			else
-			{
-				return "0";
-			}
-		}
-
-		public static string ConvertInterval(double seconds)
-		{
-			string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
-			string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:D2}.{4:D1}s";
-			string format_3 = "{0:D2}h {1:D2}m {2:D2}.{3:D1}s";
-
-			TimeSpan interval;
-
-			try
-			{
-				interval = TimeSpan.FromSeconds(seconds);
-			}
-			catch (OverflowException)
-			{
-				return "NaN";
-			}
-
-			int years = interval.Days / 365;
-
-			string output;
-			if (years > 0)
-			{
-				output = string.Format(format_1,
-					years,
-					interval.Days - (years * 365), //  subtract years * 365 for accurate day count
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			else if (interval.Days > 0)
-			{
-				output = string.Format(format_2,
-					interval.Days,
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			else
-			{
-				output = string.Format(format_3,
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			return output;
-		}
-
-		public static string UppercaseFirst(string s)
-		{
-			if (string.IsNullOrEmpty(s))
-			{
-				return string.Empty;
-			}
-			char[] a = s.ToCharArray();
-			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));
-			double T_transfer = (2 * Math.PI) * Math.Sqrt(Math.Pow((((r_target / 1000) + (r_current / 1000)) / 2), 3) / (grav_param / 1000000000));
-			return 360 * (0.5 - (T_transfer / (2 * T_target)));
-		}
-
-		public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
-		{
-			/*			
-            def deltaVToGetToOtherBody(mu, r1, r2):
-            # mu = gravity param of common orbiting body of r1 and r2
-            # (e.g. for mun to minmus, mu is kerbin's gravity param
-            # r1 = initial body's orbit radius
-            # r2 = target body's orbit radius
-		
-            # return value is km/s
-            sur1 = math.sqrt(mu / r1)
-            sr1r2 = math.sqrt(float(2*r2)/float(r1+r2))
-            mult = sr1r2 - 1
-            return sur1 * mult
-            */
-			double sur1, sr1r2, mult;
-			sur1 = Math.Sqrt(mu / r1);
-			sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
-			mult = sr1r2 - 1;
-			return sur1 * mult;
-		}
-
-		public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
-		{
-			/*			
-            def deltaVToExitSOI(mu, r1, r2, v):
-            # mu = gravity param of current body
-            # r1 = current orbit radius
-            # r2 = SOI radius
-            # v = SOI exit velocity
-            foo = r2 * (v**2) - 2 * mu
-            bar = r1 * foo + (2 * r2 * mu)
-            r = r1*r2
-            return math.sqrt(bar / r)
-            */
-			double foo = r2 * Math.Pow(v, 2) - 2 * mu;
-			double bar = r1 * foo + (2 * r2 * mu);
-			double r = r1 * r2;
-			return Math.Sqrt(bar / r);
-		}
-
-		public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
-		{
-			/*			
-            def transferBurnPoint(r, v, angle, mu):
-            # r = parking orbit radius
-            # v = ejection velocity
-            # angle = phase angle (from function phaseAngle())
-            # mu = gravity param of current body.
-            epsilon = ((v**2)/2) - (mu / r)
-            h = r * v * math.sin(angle)
-            e = math.sqrt(1 + ((2 * epsilon * h**2)/(mu**2)))
-            theta = math.acos(1.0 / e)
-            degrees = theta * (180.0 / math.pi)
-            return 180 - degrees
-            */
-			double epsilon, h, ee, theta, degrees;
-			epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
-			h = r * v * Math.Sin(angle);
-			ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
-			theta = Math.Acos(1.0 / ee);
-			degrees = theta * (180.0 / Math.PI);
-			return 180 - degrees;
-			// returns the ejection angle
-		}
-
-		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;
-			angle = angle * 360;
-			return angle;
-		}
-
-		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;
-			return eangle;
-		}
-
-		public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target)   //calculates phase angle between the current body and target body
-		{
-			Vector3d vecthis = new Vector3d();
-			Vector3d vectarget = new Vector3d();
-			vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-
-			if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
-			{
-				vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-			}
-			else
-			{
-				vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
-			}
-
-			vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
-			vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
-
-			Vector3d prograde = new Vector3d();
-			prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
-
-			double phase = Vector3d.Angle(vecthis, vectarget);
-
-			if (Vector3d.Angle(prograde, vectarget) > 90)
-				phase = 360 - phase;
-
-			return (phase + 360) % 360;
-		}
-
-		public static double FixAngleDomain(double Angle, bool Degrees = false)
-		{
-			double Extent = 2d * Math.PI;
-			if (Degrees)
-			{
-				Extent = 360d;
-			}
-
-			Angle = Angle % (Extent);
-			if (Angle < 0d)
-			{
-				Angle += Extent;
-			}
-
-			return Angle;
-		}
-
-		public static double FixDegreeDomain(double Angle)
-		{
-			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;
-			}
-			else if (transfer_angle > 0)
-			{
-				if (curr_phase > 0)
-					return curr_phase;
-				else if (curr_phase < 0)
-					return (360 + curr_phase);
-			}
-			return curr_phase;
-		}
-
-		public static double adjust_current_ejection_angle(double curr_ejection)
-		{
-			//curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
-			// need 0-360 instead
-			//
-			// ie i have -17 in the screenshot
-			// need it to show 343
-			//
-			// do this
-			//
-			// 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;
-
-		}
-
-		public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
-		{
-			// if transfer_phase_angle < 0 its a lower transfer
-			//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;
-
-		}
-
-		public static double TrueAltitude(Vessel vessel)
-		{
-			double trueAltitude = vessel.orbit.altitude - vessel.terrainAltitude;
-
-			// 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)
-			{
-				trueAltitude = vessel.orbit.altitude;
-			}
-
-			return trueAltitude;
-		}
-
-		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 "";
-		}
-
-		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.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.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 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);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
-
-			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.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.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-		}
-
-		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
-			                           );
-
-			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.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			GUILayout.Label((dv1 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
-			GUILayout.EndHorizontal();
-		}
-
-		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 adj_phase_angle = Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
-			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
-
-			//new stuff
-			//
-			double adj_trans_ejection_angle = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_angle);
-			//
-			//
-
-			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.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.EndHorizontal();
-
-			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("Transfer velocity:");
-			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);
-
-			return window;
-		}
-
-		public static Rect ClampRectToScreen(Rect window, int Margin)
-		{
-			return ClampRectToScreen(window, Margin, Margin);
-		}
-
-		public static Rect ClampRectToScreen(Rect window)
-		{
-			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);
-
-			return vec;
-		}
-
-		public static Vector2 ClampV2ToScreen(Vector2 vec, uint Margin)
-		{
-			return ClampV2ToScreen(vec, Margin, Margin);
-		}
-
-		public static Vector2 ClampV2ToScreen(Vector2 vec)
-		{
-			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();
-
-			// If we are near the top or bottom of the screen...
-			if (window.yMax > Screen.height - icon.height ||
-			    window.yMin < icon.height)
-			{
-				// If we are in a corner...
-				if (window.xMax > Screen.width - icon.width ||
-				    window.xMin < icon.width)
-				{
-					// If it is a top corner, put the icon below the window.
-					if (window.yMax < Screen.height / 2)
-					{
-						center.y = window.yMax + icon.height / 2;
-					}
-					// If it is a bottom corner, put the icon above the window.
-					else
-					{
-						center.y = window.yMin - icon.height / 2;
-					}
-				}
-				// If we are not in a corner...
-				else
-				{
-					// If we are along the top edge, align the icon's top edge with the top edge of the window
-					if (window.yMax > Screen.height / 2)
-					{
-						center.y = window.yMax - icon.height / 2;
-					}
-					// If we are along the bottom edge, align the icon's bottom edge with the bottom edge of the window
-					else
-					{
-						center.y = window.yMin + icon.height / 2;
-					}
-				}
-
-				// At the top or bottom, if we are towards the right, put the icon to the right of the window
-				if (window.center.x < Screen.width / 2)
-				{
-					center.x = window.xMin - icon.width / 2;
-				}
-				// At the top or bottom, if we are towards the left, put the icon to the left of the window
-				else
-				{
-					center.x = window.xMax + icon.width / 2;
-				}
-
-			}
-			// If we are not along the top or bottom of the screen...
-			else
-			{
-				// By default, center the icon above the window
-				center.y = window.yMin - icon.height / 2;
-				center.x = window.center.x;
-
-				// If we are along a side...
-				if (window.xMax > Screen.width - 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
-					if (window.center.y > Screen.height / 2)
-					{
-						center.y = window.yMax + icon.height / 2;
-					}
-
-					// Along the left side, align the left edge of the icon with the left edge of the window.
-					if (window.xMax > Screen.width - icon.width)
-					{
-						center.x = window.xMax - icon.width / 2;
-					}
-					// Along the right side, align the right edge of the icon with the right edge of the window.
-					else if (window.xMin < icon.width)
-					{
-						center.x = window.xMin + icon.width / 2;
-					}
-				}
-			}
-
-			// Assign the vector to the center of the rect.
-			icon.center = center;
-
-			// Return the icon's position.
-			return icon;
-		}
-
-		private static ScreenMessage debugmsg = new ScreenMessage("", 2f, ScreenMessageStyle.UPPER_RIGHT);
-
-		[System.Diagnostics.Conditional("DEBUG")]
-		public static void PostDebugMessage(string Msg)
-		{
-			if (HighLogic.LoadedScene > GameScenes.SPACECENTER)
-			{
-				debugmsg.message = Msg;
-				ScreenMessages.PostScreenMessage(debugmsg, true);
-			}
-
-			KSPLog.print(Msg);
-		}
-	}
-}

--- /dev/null
+++ b/VOIDEditorMaster.cs
@@ -1,1 +1,110 @@
+// VOID
+//
+// VOIDEditorMaster.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  Much, much credit to Younata, Adammada, Nivvydaskrl and to all the authors
+//  behind MechJeb, RemoteTech Relay Network, ISA MapSat, and Protractor for some
+//  invaluable functions and making your nicely written code available to learn from.
+//
+///////////////////////////////////////////////////////////////////////////////
+//
+//  This software uses VesselSimulator and Engineer.Extensions from Engineer Redux.
+//  Engineer Redux (c) 2013 cybutek
+//  Used by permission.
+//
+///////////////////////////////////////////////////////////////////////////////
 
+using Engineer.VesselSimulator;
+using KSP;
+using System;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
+	public class VOIDEditorMaster : MonoBehaviour
+	{
+		protected VOID_EditorCore Core;
+
+		public void Awake()
+		{
+			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
+			this.Core = VOID_EditorCore.Instance;
+			this.Core.ResetGUI ();
+			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
+		}
+
+		public void Update()
+		{
+			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
+			{
+				this.Core.SaveConfig ();
+				this.Core = null;
+				VOID_EditorCore.Reset();
+				return;
+			}
+
+			if (this.Core == null)
+			{
+				this.Awake();
+			}
+
+			this.Core.Update ();
+
+			if (this.Core.factoryReset)
+			{
+				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
+				this.Core = null;
+				VOID_EditorCore.Reset();
+			}
+		}
+
+		public void FixedUpdate()
+		{
+			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
+			{
+				return;
+			}
+
+			this.Core.FixedUpdate ();
+		}
+
+		public void OnGUI()
+		{
+			if (this.Core == null)
+			{
+				return;
+			}
+
+			this.Core.OnGUI();
+		}
+	}
+}
+

--- a/VOIDFlightMaster.cs
+++ b/VOIDFlightMaster.cs
@@ -1,21 +1,30 @@
-///////////////////////////////////////////////////////////////////////////////
+// VOID
 //
-//    VOID - Vessel Orbital Information Display for Kerbal Space Program
-//    Copyright (C) 2012 Iannic-ann-od
-//    Copyright (C) 2013 Toadicus
+// VOIDFlightMaster.cs
 //
-//    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.
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//    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.
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//    You should have received a copy of the GNU General Public License
-//    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 //
 ///////////////////////////////////////////////////////////////////////////////
 //
@@ -34,6 +43,7 @@
 using System;
 using UnityEngine;
 using Engineer.VesselSimulator;
+using ToadicusTools;
 
 namespace VOID
 {
@@ -47,7 +57,6 @@
 			Tools.PostDebugMessage ("VOIDFlightMaster: Waking up.");
 			this.Core = (VOID_Core)VOID_Core.Instance;
 			this.Core.ResetGUI ();
-			SimManager.HardReset();
 			Tools.PostDebugMessage ("VOIDFlightMaster: Awake.");
 		}
 
@@ -96,65 +105,5 @@
 			this.Core.OnGUI();
 		}
     }
-
-	[KSPAddon(KSPAddon.Startup.EditorAny, false)]
-	public class VOIDEditorMaster : MonoBehaviour
-	{
-		protected VOID_EditorCore Core;
-
-		public void Awake()
-		{
-			Tools.PostDebugMessage ("VOIDEditorMaster: Waking up.");
-			this.Core = VOID_EditorCore.Instance;
-			this.Core.ResetGUI ();
-			SimManager.HardReset();
-			Tools.PostDebugMessage ("VOIDEditorMaster: Awake.");
-		}
-
-		public void Update()
-		{
-			if (!HighLogic.LoadedSceneIsEditor && this.Core != null)
-			{
-				this.Core.SaveConfig ();
-				this.Core = null;
-				VOID_EditorCore.Reset();
-				return;
-			}
-
-			if (this.Core == null)
-			{
-				this.Awake();
-			}
-
-			this.Core.Update ();
-
-			if (this.Core.factoryReset)
-			{
-				KSP.IO.File.Delete<VOID_EditorCore>("config.xml");
-				this.Core = null;
-				VOID_EditorCore.Reset();
-			}
-		}
-
-		public void FixedUpdate()
-		{
-			if (this.Core == null || !HighLogic.LoadedSceneIsEditor)
-			{
-				return;
-			}
-
-			this.Core.FixedUpdate ();
-		}
-
-		public void OnGUI()
-		{
-			if (this.Core == null)
-			{
-				return;
-			}
-
-			this.Core.OnGUI();
-		}
-	}
 }
 

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -1,26 +1,35 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_CBInfoBrowser.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -98,8 +107,6 @@
 			GUILayout.EndVertical();
 
 			GUILayout.EndHorizontal();
-
-			//}
 
 			//toggle for orbital info chunk
 			if (GUILayout.Button("Orbital Characteristics", GUILayout.ExpandWidth(true))) toggleOrbital.value = !toggleOrbital;
@@ -206,84 +213,53 @@
 
 		private void body_OP_show_orbital_info(CelestialBody body)
 		{
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToAp), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.PeA / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.timeToPe), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.semiMajorAxis / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    else GUILayout.Label(Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.orbit.period), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
+		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+		    else GUILayout.Label(VOID_Tools.ConvertInterval(body.rotationPeriod), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.orbitalSpeed / 1000).ToString("F2") + "km/s", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			// Toadicus edit: convert mean anomaly into degrees.
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.meanAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label(body.orbit.trueAnomaly.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			// Toadicus edit: convert eccentric anomaly into degrees.
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label((body.orbit.eccentricAnomaly * 180d / Math.PI).ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label(body.orbit.inclination.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label(body.orbit.LAN.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else GUILayout.Label(body.orbit.argumentOfPeriapsis.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-		    //GUILayout.EndHorizontal();
-
-		    //GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 		    if (body.bodyName == "Sun") GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    else
 		    {
@@ -291,42 +267,28 @@
 		        if (body.tidallyLocked) body_tidally_locked = "Yes";
 		        GUILayout.Label(body_tidally_locked, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 		    }
-		    //GUILayout.EndHorizontal();
 		}
 
 		private void body_OP_show_physical_info(CelestialBody body)
 		{
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label(((Math.Pow((body.Radius), 2) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			// divide by 1000 to convert m to km
 			GUILayout.Label((((4d / 3) * Math.PI * Math.Pow(body.Radius, 3)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.Label(((4 / 3) * Math.PI * Math.Pow((vessel.mainBody.Radius / 1000), 3)).ToString(), right, GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
 
 			double p = body.Mass / (Math.Pow(body.Radius, 3) * (4d / 3) * Math.PI);
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			if (body.bodyName == "Sun") GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 			else GUILayout.Label(Tools.MuMech_ToSI(body.sphereOfInfluence), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label(body.orbitingBodies.Count.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
 
 			//show # artificial satellites
 			int num_art_sats = 0;
@@ -335,30 +297,31 @@
 				if (v.mainBody == body && v.situation.ToString() == "ORBITING") num_art_sats++;
 			}
 
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
 
 			double g_ASL = (VOID_Core.Constant_G * body.Mass) / Math.Pow(body.Radius, 2);
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
 			GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-			string O2 = "No";
-			if (body.atmosphereContainsOxygen == true) O2 = "Yes";
-			GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
-
-			//GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+
+			if (body.atmosphere)
+			{
+				GUILayout.Label("≈ " + Tools.MuMech_ToSI(body.maxAtmosphereAltitude) + "m",
+					VOID_Core.Instance.LabelStyles["right"],
+					GUILayout.ExpandWidth(true));
+
+				string O2 = "No";
+				if (body.atmosphereContainsOxygen == true) O2 = "Yes";
+				GUILayout.Label(O2, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			}
+			else
+			{
+				GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+				GUILayout.Label("N/A", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
+			}
+
 			string ocean = "No";
 			if (body.ocean == true) ocean = "Yes";
 			GUILayout.Label(ocean, VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
-			//GUILayout.EndHorizontal();
 		}
 	}
 }

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -1,29 +1,38 @@
+// VOID
 //
-//  VOID_Core.cs
+// VOID_Core.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using Engineer.VesselSimulator;
+using KSP;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using KSP;
+using ToadicusTools;
 using UnityEngine;
-using Engineer.VesselSimulator;
 
 namespace VOID
 {
@@ -33,15 +42,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,12 +74,11 @@
 		}
 
 		public static double Constant_G = 6.674e-11;
-
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.9.17";
+		protected string VoidVersion = "0.10.0";
 
 		protected bool _factoryReset = false;
 
@@ -80,35 +90,37 @@
 
 		[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 VOIDIconTexture;
-		protected string VOIDIconOnPath = "VOID/Textures/void_icon_on";
-		protected string VOIDIconOffPath = "VOID/Textures/void_icon_off";
+		protected string VOIDIconOnActivePath;
+		protected string VOIDIconOnInactivePath;
+		protected string VOIDIconOffActivePath;
+		protected string VOIDIconOffInactivePath;
+
 		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>();
+
+		protected CelestialBody _Kerbin;
 
 		[AVOID_SaveValue("togglePower")]
 		public VOID_SaveValue<bool> togglePower = true;
-
 		public bool powerAvailable = true;
 
 		[AVOID_SaveValue("consumeResource")]
@@ -121,44 +133,41 @@
 		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> _skinName;
-		protected Dictionary<string, GUISkin> skin_list;
-		protected List<string> skinNames;
+		protected int _skinIdx;
+
+		protected Dictionary<string, GUISkin> validSkins;
+		protected 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 = false;
-		internal ToolbarButtonWrapper ToolbarButton;
+		internal IButton ToolbarButton;
 
 		/*
 		 * Properties
@@ -183,11 +192,18 @@
 		{
 			get
 			{
-				if (!this.skinsLoaded || this._skinName == null)
-				{
-					return AssetBase.GetGUISkin(this.defaultSkin);
-				}
-				return this.skin_list[this._skinName];
+				if (this.skinsLoaded)
+				{
+					try
+					{
+						return this.validSkins[this._skinName];
+					}
+					catch
+					{
+					}
+				}
+
+				return AssetBase.GetGUISkin(this.defaultSkin);
 			}
 		}
 
@@ -197,7 +213,7 @@
 			{
 				if (this._windowID == 0)
 				{
-				this._windowID = this.windowBaseID;
+					this._windowID = this.windowBaseID;
 				}
 				return this._windowID++;
 			}
@@ -215,7 +231,23 @@
 		{
 			get
 			{
-				return this._allBodies;
+				return FlightGlobals.Bodies;
+			}
+		}
+
+		public CelestialBody Kerbin
+		{
+			get
+			{
+				if (this._Kerbin == null)
+				{
+					if (FlightGlobals.Bodies != null)
+					{
+						this._Kerbin = FlightGlobals.Bodies.First(b => b.name == "Kerbin");
+					}
+				}
+
+				return this._Kerbin;
 			}
 		}
 
@@ -243,20 +275,57 @@
 			}
 		}
 
+		protected IconState powerState
+		{
+			get
+			{
+				if (this.togglePower && this.powerAvailable)
+				{
+					return IconState.PowerOn;
+				}
+				else
+				{
+					return IconState.PowerOff;
+				}
+
+			}
+		}
+
+		protected IconState activeState
+		{
+			get
+			{
+				if (this.mainGuiMinimized)
+				{
+					return IconState.Inactive;
+				}
+				else
+				{
+					return IconState.Active;
+				}
+
+			}
+		}
+
 		protected bool UseToolbarManager
 		{
 			get
 			{
-				return _UseToolbarManager;
+				return _UseToolbarManager & ToolbarManager.ToolbarAvailable;
 			}
 			set
 			{
-				if (value == false && this.ToolbarManagerLoaded && this.ToolbarButton != null)
+				if (this._UseToolbarManager == value)
+				{
+					return;
+				}
+
+				if (value == false && this.ToolbarButton != null)
 				{
 					this.ToolbarButton.Destroy();
 					this.ToolbarButton = null;
 				}
-				if (value == true && this.ToolbarManagerLoaded && this.ToolbarButton == null)
+				if (value == true)
 				{
 					this.InitializeToolbarButton();
 				}
@@ -268,372 +337,13 @@
 		/*
 		 * Methods
 		 * */
-		protected VOID_Core()
-		{
-			this._Name = "VOID Core";
-
-			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.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 (
-				"{0}: Found {1} modules to check.",
-				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
-					));
-
-				this.LoadModule(voidType);
-			}
-
-			this._modulesLoaded = true;
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: Loaded {1} modules.",
-				this.GetType().Name,
-				this.Modules.Count
-				));
-		}
-
-		protected void LoadModule(Type T)
-		{
-			var existingModules = this._modules.Where (mod => mod.GetType ().Name == T.Name);
-			if (existingModules.Any())
-			{
-				Tools.PostDebugMessage(string.Format(
-					"{0}: refusing to load {1}: already loaded",
-					this.GetType().Name,
-					T.Name
-					));
-				return;
-			}
-			IVOID_Module module = Activator.CreateInstance (T) as IVOID_Module;
-			module.LoadConfig();
-			this._modules.Add (module);
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: loaded module {1}.",
-				this.GetType().Name,
-				T.Name
-				));
-		}
-
-		protected void LoadSkins()
-		{
-			Tools.PostDebugMessage ("AssetBase has skins: \n" +
-			                        string.Join("\n\t", AssetBase.FindObjectsOfTypeIncludingAssets (
-				typeof(GUISkin))
-			            .Select(s => s.ToString())
-			            .ToArray()
-			            )
-			                        );
-
-			this.skin_list = AssetBase.FindObjectsOfTypeIncludingAssets(typeof(GUISkin))
-				.Where(s => !this.forbiddenSkins.Contains(s.name))
-					.Select(s => s as GUISkin)
-					.GroupBy(s => s.name)
-					.Select(g => g.First())
-					.ToDictionary(s => s.name);
-
-			Tools.PostDebugMessage(string.Format(
-				"{0}: loaded {1} GUISkins.",
-				this.GetType().Name,
-				this.skin_list.Count
-				));
-
-			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._skinName.ToString()
-				));
-
-			this.skinsLoaded = true;
-		}
-
-		protected void LoadGUIStyles()
-		{
-			this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["link"].fontStyle = FontStyle.Bold;
-
-			this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["center"].normal.textColor = Color.white;
-			this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
-
-			this.LabelStyles["center_bold"] = new GUIStyle(GUI.skin.label);
-			this.LabelStyles["center_bold"].normal.textColor = Color.white;
-			this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
-			this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
-
-			this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
-			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.GUIStylesLoaded = true;
-		}
-
-		protected void LoadAllBodies()
-		{
-			this._allBodies = FlightGlobals.Bodies;
-			this.bodiesLoaded = true;
-		}
-
-		protected void LoadVesselTypes()
-		{
-			this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
-			this.vesselTypesLoaded = true;
-		}
-
-		protected void LoadBeforeUpdate()
-		{
-			if (!this.bodiesLoaded)
-			{
-				this.LoadAllBodies();
-			}
-
-			if (!this.vesselTypesLoaded)
-			{
-				this.LoadVesselTypes();
-			}
-		}
-
-		protected void LoadToolbarManager()
-		{
-			Type ToolbarManager = AssemblyLoader.loadedAssemblies
-				.Select(a => a.assembly.GetExportedTypes())
-					.SelectMany(t => t)
-					.FirstOrDefault(t => t.FullName == "Toolbar.ToolbarManager");
-
-			if (ToolbarManager == null)
-			{
-				Tools.PostDebugMessage(string.Format(
-					"{0}: Could not load ToolbarManager.",
-					this.GetType().Name
-				));
-
-				return;
-			}
-
-			this.InitializeToolbarButton();
-
-			this.ToolbarManagerLoaded = true;
-		}
-
-		protected void InitializeToolbarButton()
-		{
-			this.ToolbarButton = new ToolbarButtonWrapper(this.GetType().Name, "coreToggle");
-			this.ToolbarButton.Text = this.VoidName;
-			this.ToolbarButton.TexturePath = this.VOIDIconOffPath + "_24x24";
-			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 _)
-		{
-			GUILayout.BeginVertical();
-			
-			if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
-			{
-				if (!HighLogic.LoadedSceneIsEditor)
-				{
-					string str = "ON";
-					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);
-					}
-			    }
-			}
-			else
-			{
-			    GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
-			}
-
-			this.configWindowMinimized.value = !GUILayout.Toggle (!this.configWindowMinimized, "Configuration");
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
-
-		public void VOIDConfigWindow(int _)
-		{
-			GUILayout.BeginVertical ();
-
-			this.DrawConfigurables ();
-
-			GUILayout.EndVertical ();
-			GUI.DragWindow ();
-		}
-
-		public override void DrawConfigurables()
-		{
-			int skinIdx;
-
-			GUIContent _content;
-
-			if (HighLogic.LoadedSceneIsFlight)
-			{
-				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));
-
-			_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)))
-			{
-				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._skinName,
-					this.skin_list.Count
-				));
-			}
-
-			_content.text = this.Skin.name;
-			_content.tooltip = "Current skin";
-			GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
-
-			_content.text = "►";
-			_content.tooltip = "Select next skin";
-			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
-			{
-				skinIdx++;
-				if (skinIdx >= skinNames.Count) skinIdx = 0;
-				Tools.PostDebugMessage (string.Format (
-					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
-					this.GetType().Name,
-					this._skinName,
-					this.skin_list.Count
-					));
-			}
-
-			if (this._skinName != skinNames[skinIdx])
-			{
-				this._skinName = skinNames[skinIdx];
-			}
-
-			GUILayout.EndHorizontal();
-
-			GUILayout.BeginHorizontal();
-			GUILayout.Label("Update Rate (Hz):");
-			if (this.stringFrequency == null)
-			{
-				this.stringFrequency = (1f / this.updatePeriod).ToString();
-			}
-			this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
-			// GUILayout.FlexibleSpace();
-			if (GUILayout.Button("Apply"))
-			{
-				double updateFreq = 1f / this.updatePeriod;
-				double.TryParse(stringFrequency, out updateFreq);
-				this._updatePeriod = 1 / updateFreq;
-			}
-			GUILayout.EndHorizontal();
-
-			foreach (IVOID_Module mod in this.Modules)
-			{
-				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();
+				this.LoadModulesOfType<IVOID_Module>();
 			}
 
 			if (!this.skinsLoaded)
@@ -645,42 +355,36 @@
 
 			if (!this.GUIStylesLoaded)
 			{
-				this.LoadGUIStyles ();
-			}
-
-			if (this.UseToolbarManager && this.ToolbarManagerLoaded)
-			{
-				this.ToolbarButton.TexturePath = VOIDIconOffPath + "_24x24";
-				if (this.togglePower)
-				{
-					this.ToolbarButton.TexturePath = VOIDIconOnPath + "_24x24";
-				}
-			}
-			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, new GUIStyle()) && this.VOIDIconLocked)
-				{
-					this.mainGuiMinimized.value = !this.mainGuiMinimized;
-				}
+				this.LoadGUIStyles();
+			}
+
+			if (!this.UseToolbarManager)
+			{
+				if (GUI.Button(VOIDIconPos, VOIDIconTexture, this.iconStyle) && this.VOIDIconLocked)
+				{
+					this.ToggleMainWindow();
+				}
+			}
+			else if (this.ToolbarButton == null)
+			{
+				this.InitializeToolbarButton();
 			}
 
 			if (!this.mainGuiMinimized)
 			{
+
 				Rect _mainWindowPos = this.mainWindowPos;
 
-				_mainWindowPos = GUILayout.Window (
+				_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);
+					string.Join(" ", new string[] { this.VoidName, this.VoidVersion }),
+					GUILayout.Width(250),
+					GUILayout.Height(50)
+				);
+
+				_mainWindowPos = Tools.ClampRectToScreen(_mainWindowPos);
 
 				if (_mainWindowPos != this.mainWindowPos)
 				{
@@ -692,16 +396,16 @@
 			{
 				Rect _configWindowPos = this.configWindowPos;
 
-				_configWindowPos = GUILayout.Window (
+				_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);
+					string.Join(" ", new string[] { this.VoidName, "Configuration" }),
+					GUILayout.Width(250),
+					GUILayout.Height(50)
+				);
+
+				_configWindowPos = Tools.ClampRectToScreen(_configWindowPos);
 
 				if (_configWindowPos != this.configWindowPos)
 				{
@@ -735,8 +439,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}" +
@@ -767,36 +470,35 @@
 
 		public void Update()
 		{
-			this.LoadBeforeUpdate ();
+			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();
+				SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
+					Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
+				SimManager.TryStartSimulation();
 			}
 
 			if (!this.guiRunning)
 			{
-				this.StartGUI ();
+				this.StartGUI();
 			}
 
 			if (!HighLogic.LoadedSceneIsFlight && this.guiRunning)
 			{
-				this.StopGUI ();
+				this.StopGUI();
 			}
 
 			foreach (IVOID_Module module in this.Modules)
 			{
 				if (!module.guiRunning && module.toggleActive)
 				{
-					module.StartGUI ();
+					module.StartGUI();
 				}
 				if (module.guiRunning && !module.toggleActive ||
 				    !this.togglePower ||
 				    !HighLogic.LoadedSceneIsFlight ||
-				    this.factoryReset
-				    )
+				    this.factoryReset)
 				{
 					module.StopGUI();
 				}
@@ -807,26 +509,36 @@
 				}
 			}
 
-			this.CheckAndSave ();
+			this.CheckAndSave();
 			this._updateTimer += Time.deltaTime;
 		}
 
 		public void FixedUpdate()
 		{
-			if (this.consumeResource &&
+			bool newPowerState = this.powerAvailable;
+
+			if (this.togglePower && this.consumeResource &&
 			    this.vessel.vesselType != VesselType.EVA &&
-			    TimeWarp.deltaTime != 0
-			    )
-			{
-				float powerReceived = this.vessel.rootPart.RequestResource(this.resourceName,
-				                                                           this.resourceRate * TimeWarp.fixedDeltaTime);
+			    TimeWarp.deltaTime != 0)
+			{
+				float powerReceived = this.vessel.rootPart.RequestResource(
+					this.resourceName,
+					this.resourceRate * TimeWarp.fixedDeltaTime
+				);
+
 				if (powerReceived > 0)
 				{
-					this.powerAvailable = true;
+					newPowerState = true;
 				}
 				else
 				{
-					this.powerAvailable = false;
+					newPowerState = false;
+				}
+
+				if (this.powerAvailable != newPowerState)
+				{
+					this.powerAvailable = newPowerState;
+					this.SetIconTexture(this.powerState | this.activeState);
 				}
 			}
 
@@ -839,15 +551,378 @@
 
 		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();
+		}
+
+		public void VOIDMainWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			if (this.powerAvailable || HighLogic.LoadedSceneIsEditor)
+			{
+				if (!HighLogic.LoadedSceneIsEditor)
+				{
+					string str = string.Intern("ON");
+					if (togglePower)
+						str = string.Intern("OFF");
+					if (GUILayout.Button("Power " + str))
+					{
+						togglePower.value = !togglePower;
+						this.SetIconTexture(this.powerState | this.activeState);
+					}
+				}
+
+				if (togglePower || HighLogic.LoadedSceneIsEditor)
+				{
+					foreach (IVOID_Module module in this.Modules)
+					{
+						module.toggleActive = GUILayout.Toggle(module.toggleActive, module.Name);
+					}
+				}
+			}
+			else
+			{
+				GUILayout.Label("-- POWER LOST --", this.LabelStyles["red"]);
+			}
+
+			this.configWindowMinimized.value = !GUILayout.Toggle(!this.configWindowMinimized, "Configuration");
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
+		}
+
+		public void VOIDConfigWindow(int _)
+		{
+			GUILayout.BeginVertical();
+
+			this.DrawConfigurables();
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
+		}
+
+		public override void DrawConfigurables()
+		{
+			GUIContent _content;
+
+			if (HighLogic.LoadedSceneIsFlight)
+			{
+				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));
+
+			_content = new GUIContent();
+
+			_content.text = "◄";
+			_content.tooltip = "Select previous skin";
+			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+			{
+				this.GUIStylesLoaded = false;
+				this._skinIdx--;
+				Tools.PostDebugMessage(string.Format(
+					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+					this.GetType().Name,
+					this._skinName,
+					this.validSkins.Count
+				));
+			}
+
+			_content.text = this.Skin.name;
+			_content.tooltip = "Current skin";
+			GUILayout.Label(_content, this.LabelStyles["center"], GUILayout.ExpandWidth(true));
+
+			_content.text = "►";
+			_content.tooltip = "Select next skin";
+			if (GUILayout.Button(_content, GUILayout.ExpandWidth(true)))
+			{
+				this.GUIStylesLoaded = false;
+				this._skinIdx++;
+				Tools.PostDebugMessage(string.Format(
+					"{0}: new this._skinIdx = {1} :: skin_list.Count = {2}",
+					this.GetType().Name,
+					this._skinName,
+					this.validSkins.Count
+				));
+			}
+
+			this._skinIdx %= this.skinNames.Length;
+			if (this._skinIdx < 0)
+			{
+				this._skinIdx += this.skinNames.Length;
+			}
+
+			if (this._skinName != skinNames[this._skinIdx])
+			{
+				this._skinName.value = skinNames[this._skinIdx];
+			}
+
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal();
+			GUILayout.Label("Update Rate (Hz):");
+			if (this.stringFrequency == null)
+			{
+				this.stringFrequency = (1f / this.updatePeriod).ToString();
+			}
+			this.stringFrequency = GUILayout.TextField(this.stringFrequency.ToString(), 5, GUILayout.ExpandWidth(true));
+			// GUILayout.FlexibleSpace();
+			if (GUILayout.Button("Apply"))
+			{
+				double updateFreq = 1f / this.updatePeriod;
+				double.TryParse(stringFrequency, out updateFreq);
+				this._updatePeriod = 1 / updateFreq;
+			}
+			GUILayout.EndHorizontal();
+
+			foreach (IVOID_Module mod in this.Modules)
+			{
+				mod.DrawConfigurables();
+			}
+
+			this._factoryReset = GUILayout.Toggle(this._factoryReset, "Factory Reset");
+		}
+
+		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(
+				"{0}: Found {1} modules to check.",
+				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
+				));
+
+				this.LoadModule(voidType);
+			}
+
+			this._modulesLoaded = true;
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: Loaded {1} modules.",
+				this.GetType().Name,
+				this.Modules.Count
+			));
+		}
+
+		protected void LoadModule(Type T)
+		{
+			var existingModules = this._modules.Where(mod => mod.GetType().Name == T.Name);
+			if (existingModules.Any())
+			{
+				Tools.PostDebugMessage(string.Format(
+					"{0}: refusing to load {1}: already loaded",
+					this.GetType().Name,
+					T.Name
+				));
+				return;
+			}
+			IVOID_Module module = Activator.CreateInstance(T) as IVOID_Module;
+			module.LoadConfig();
+			this._modules.Add(module);
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: loaded module {1}.",
+				this.GetType().Name,
+				T.Name
+			));
+		}
+
+		protected void LoadSkins()
+		{
+			Tools.PostDebugMessage("AssetBase has skins: \n" +
+				string.Join("\n\t",
+					Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+					.Select(s => s.ToString())
+					.ToArray()
+				)
+			);
+
+			this.validSkins = Resources.FindObjectsOfTypeAll(typeof(GUISkin))
+				.Where(s => !this.forbiddenSkins.Contains(s.name))
+				.Select(s => s as GUISkin)
+				.GroupBy(s => s.name)
+				.Select(g => g.First())
+				.ToDictionary(s => s.name);
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: loaded {1} GUISkins.",
+				this.GetType().Name,
+				this.validSkins.Count
+			));
+
+			this.skinNames = this.validSkins.Keys.ToArray();
+			Array.Sort(this.skinNames);
+
+			int defaultIdx = int.MinValue;
+
+			for (int i = 0; i < this.skinNames.Length; i++)
+			{
+				if (this.skinNames[i] == this._skinName)
+				{
+					this._skinIdx = i;
+				}
+				if (this.skinNames[i] == this.defaultSkin)
+				{
+					defaultIdx = i;
+				}
+				if (this._skinIdx != int.MinValue && defaultIdx != int.MinValue)
+				{
+					break;
+				}
+			}
+
+			if (this._skinIdx == int.MinValue)
+			{
+				this._skinIdx = defaultIdx;
+			}
+
+			Tools.PostDebugMessage(string.Format(
+				"{0}: _skinIdx = {1}.",
+				this.GetType().Name,
+				this._skinName.ToString()
+			));
+
+			this.skinsLoaded = true;
+		}
+
+		protected void LoadGUIStyles()
+		{
+			this.LabelStyles["link"] = new GUIStyle(GUI.skin.label);
+			this.LabelStyles["link"].fontStyle = FontStyle.Bold;
+
+			this.LabelStyles["center"] = new GUIStyle(GUI.skin.label);
+			this.LabelStyles["center"].normal.textColor = Color.white;
+			this.LabelStyles["center"].alignment = TextAnchor.UpperCenter;
+
+			this.LabelStyles["center_bold"] = new GUIStyle(GUI.skin.label);
+			this.LabelStyles["center_bold"].normal.textColor = Color.white;
+			this.LabelStyles["center_bold"].alignment = TextAnchor.UpperCenter;
+			this.LabelStyles["center_bold"].fontStyle = FontStyle.Bold;
+
+			this.LabelStyles["right"] = new GUIStyle(GUI.skin.label);
+			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.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 LoadVesselTypes()
+		{
+			this._allVesselTypes = Enum.GetValues(typeof(VesselType)).OfType<VesselType>().ToList();
+			this.vesselTypesLoaded = true;
+		}
+
+		protected void LoadBeforeUpdate()
+		{
+			if (!this.vesselTypesLoaded)
+			{
+				this.LoadVesselTypes();
+			}
+		}
+
+		protected void InitializeToolbarButton()
+		{
+			// Do nothing if the Toolbar is not available.
+			if (!ToolbarManager.ToolbarAvailable)
+			{
+				return;
+			}
+
+			this.ToolbarButton = ToolbarManager.Instance.add(this.VoidName, "coreToggle");
+			this.ToolbarButton.Text = this.VoidName;
+			this.SetIconTexture(this.powerState | this.activeState);
+
+			this.ToolbarButton.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.FLIGHT, GameScenes.SPH);
+
+			this.ToolbarButton.OnClick += 
+				(e) =>
+			{
+				this.ToggleMainWindow();
+			};
+
+			Tools.PostDebugMessage(string.Format("{0}: Toolbar Button initialized.", this.GetType().Name));
+		}
+
+		protected void ToggleMainWindow()
+		{
+			this.mainGuiMinimized = !this.mainGuiMinimized;
+			this.SetIconTexture(this.powerState | this.activeState);
+		}
+
+		protected void SetIconTexture(IconState state)
+		{
+			switch (state)
+			{
+				case (IconState.PowerOff | IconState.Inactive):
+					this.SetIconTexture(this.VOIDIconOffInactivePath);
+					break;
+				case (IconState.PowerOff | IconState.Active):
+					this.SetIconTexture(this.VOIDIconOffActivePath);
+					break;
+				case (IconState.PowerOn | IconState.Inactive):
+					this.SetIconTexture(this.VOIDIconOnInactivePath);
+					break;
+				case (IconState.PowerOn | IconState.Active):
+					this.SetIconTexture(this.VOIDIconOnActivePath);
+					break;
+				default:
+					throw new NotImplementedException();
+			}
+		}
+
+		protected void SetIconTexture(string texturePath)
+		{
+			if (this.ToolbarButton != null)
+			{
+				this.ToolbarButton.TexturePath = texturePath;
+			}
+
+			this.VOIDIconTexture = GameDatabase.Instance.GetTexture(texturePath, false);
 		}
 
 		protected void CheckAndSave()
@@ -861,42 +936,90 @@
 					return;
 				}
 
-				Tools.PostDebugMessage (string.Format (
+				Tools.PostDebugMessage(string.Format(
 					"{0}: Time to save, checking if configDirty: {1}",
-					this.GetType ().Name,
+					this.GetType().Name,
 					this.configDirty
-					));
-
-				this.SaveConfig ();
+				));
+
+				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();
 
 			this.configDirty = false;
+		}
+
+		protected VOID_Core()
+		{
+			this._Name = "VOID Core";
+
+			this._Active.value = true;
+
+			this._skinName = this.defaultSkin;
+			this._skinIdx = int.MinValue;
+
+			this.VOIDIconOnInactivePath = "VOID/Textures/void_icon_light_glow";
+			this.VOIDIconOnActivePath = "VOID/Textures/void_icon_dark_glow";
+			this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
+			this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
+
+			this.UseToolbarManager = false;
+
+			this.LoadConfig();
+
+			this.SetIconTexture(this.powerState | this.activeState);
+		}
+
+		protected enum IconState
+		{
+			PowerOff = 1,
+			PowerOn = 2,
+			Inactive = 4,
+			Active = 8
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static VOID_Core core
+		{
+			get
+			{
+				return VOID_Core.Instance;
+			}
+		}
+
+		public static double KerbinGee
+		{
+			get
+			{
+				return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+			}
 		}
 	}
 }

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -1,26 +1,35 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_DataLogger.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -88,7 +97,7 @@
 			GUILayout.BeginVertical();
 
 			GUILayout.Label("System time: " + DateTime.Now.ToString("HH:mm:ss"));
-			GUILayout.Label(Tools.ConvertInterval(stopwatch1));
+			GUILayout.Label(VOID_Tools.ConvertInterval(stopwatch1));
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			if (GUILayout.Button("Start"))

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -1,24 +1,33 @@
-//
-//  VOID_DataValue.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/>.
+// VOID
+//
+// VOID_DataValue.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -48,6 +57,7 @@
 		 * */
 		protected T cache;
 		protected Func<T> ValueFunc;
+		protected float lastUpdate;
 
 		/* 
 		 * Properties
@@ -55,8 +65,17 @@
 		public string Label { get; protected set; }
 		public string Units { get; protected set; }
 
-		public T Value {
-			get {
+		public T Value
+		{
+			get
+			{
+				if (
+					(VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) ||
+					(this.lastUpdate > VOID_Core.Instance.updateTimer)
+				)
+				{
+					this.Refresh();
+				}
 				return (T)this.cache;
 			}
 		}
@@ -69,11 +88,13 @@
 			this.Label = Label;
 			this.Units = Units;
 			this.ValueFunc = ValueFunc;
+			this.lastUpdate = 0;
 		}
 
 		public void Refresh()
 		{
 			this.cache = this.ValueFunc.Invoke ();
+			this.lastUpdate = VOID_Core.Instance.updateTimer;
 		}
 
 		public T GetFreshValue()
@@ -106,30 +127,94 @@
 		}
 	}
 
-	internal interface IVOID_NumericValue
-	{
-		double ToDouble();
-		string ToString(string format);
-		string ToSIString(int digits, int MinMagnitude, int MaxMagnitude);
-	}
-
-	public abstract class VOID_NumValue<T> : VOID_DataValue<T>, IVOID_NumericValue
-	{
-		public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units) {}
-
-		public abstract double ToDouble();
-		public abstract string ToString(string Format);
-		public abstract string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue);
-
-		public abstract string ValueUnitString(string format);
+	public abstract class VOID_NumValue<T> : VOID_DataValue<T>
+		where T : IFormattable, IConvertible, IComparable
+	{
+		public static implicit operator Double(VOID_NumValue<T> v)
+		{
+			return v.ToDouble();
+		}
+
+		public static implicit operator Int32(VOID_NumValue<T> v)
+		{
+			return v.ToInt32();
+		}
+
+
+		public static implicit operator Single(VOID_NumValue<T> v)
+		{
+			return v.ToSingle();
+		}
+
+
+		protected IFormatProvider formatProvider;
+
+		public VOID_NumValue(string Label, Func<T> ValueFunc, string Units = "") : base(Label, ValueFunc, Units)
+		{
+			this.formatProvider = System.Globalization.CultureInfo.CurrentUICulture;
+		}
+
+		public virtual double ToDouble(IFormatProvider provider)
+		{
+			return this.Value.ToDouble(provider);
+		}
+
+		public virtual double ToDouble()
+		{
+			return this.ToDouble(this.formatProvider);
+		}
+
+		public virtual int ToInt32(IFormatProvider provider)
+		{
+			return this.Value.ToInt32(provider);
+		}
+
+		public virtual int ToInt32()
+		{
+			return this.ToInt32(this.formatProvider);
+		}
+
+		public virtual float ToSingle(IFormatProvider provider)
+		{
+			return this.Value.ToSingle(provider);
+		}
+
+		public virtual float ToSingle()
+		{
+			return this.ToSingle(this.formatProvider);
+		}
+
+		public virtual string ToString(string Format)
+		{
+			return string.Format (
+				"{0}: {1}{2}",
+				this.Label,
+				this.Value.ToString(Format, this.formatProvider),
+				this.Units
+			);
+		}
+
+		public virtual string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
+		{
+			return string.Format (
+				"{0}{1}",
+				Tools.MuMech_ToSI (this, digits, MinMagnitude, MaxMagnitude),
+				this.Units
+			);
+		}
+
+		public virtual string ValueUnitString(string format)
+		{
+			return this.Value.ToString(format, this.formatProvider) + this.Units;
+		}
 		
 		public virtual string ValueUnitString(int digits) {
-			return Tools.MuMech_ToSI(this.ToDouble(), digits) + this.Units;
+			return Tools.MuMech_ToSI(this, digits) + this.Units;
 		}
 
 		public virtual string ValueUnitString(int digits, int MinMagnitude, int MaxMagnitude)
 		{
-			return Tools.MuMech_ToSI(this.ToDouble(), digits, MinMagnitude, MaxMagnitude) + this.Units;
+			return Tools.MuMech_ToSI(this, digits, MinMagnitude, MaxMagnitude) + this.Units;
 		}
 
 		public virtual void DoGUIHorizontal(string format)
@@ -159,19 +244,26 @@
 
 		public virtual int DoGUIHorizontalPrec(int digits)
 		{
-			float magnitude;
-			float magLimit;
-
-			magnitude = (float)Math.Log10(Math.Abs(this.ToDouble()));
-
-			magLimit = Mathf.Max(magnitude, 6f);
-			magLimit = Mathf.Round((float)Math.Ceiling(magLimit / 3f) * 3f);
+			double magnitude;
+			double magLimit;
+
+			magnitude = Math.Log10(Math.Abs((double)this));
+
+			magLimit = Math.Max(Math.Abs(magnitude), 3d) + 3d;
+			magLimit = Math.Round(Math.Ceiling(magLimit / 3f)) * 3d;
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(this.Label + "ⁱ:", GUILayout.ExpandWidth(true));
 			GUILayout.FlexibleSpace();
 
-			GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+			if (magnitude >= 0)
+			{
+				GUILayout.Label(this.ValueUnitString(3, int.MinValue, (int)magnitude - digits), GUILayout.ExpandWidth(false));
+			}
+			else
+			{
+				GUILayout.Label(this.ValueUnitString(3, (int)magnitude + digits, int.MaxValue), GUILayout.ExpandWidth(false));
+			}
 			GUILayout.EndHorizontal();
 
 			if (Event.current.type == EventType.mouseUp)
@@ -179,6 +271,11 @@
 				Rect lastRect = GUILayoutUtility.GetLastRect();
 				if (lastRect.Contains(Event.current.mousePosition))
 				{
+					Tools.PostDebugMessage(string.Format("{0}: Changing digits from {1} within magLimit {2}.",
+						this.GetType().Name,
+						digits,
+						magLimit));
+
 					if (Event.current.button == 0)
 					{
 						digits = (digits + 3) % (int)magLimit;
@@ -186,11 +283,22 @@
 					else if (Event.current.button == 1)
 					{
 						digits = (digits - 3) % (int)magLimit;
-						if (digits < 0)
-						{
-							digits = (int)magLimit - 3;
-						}
 					}
+
+					if (digits < 0)
+					{
+						digits += (int)magLimit;
+					}
+
+					Tools.PostDebugMessage(string.Format("{0}: Changed digits to {1}." +
+						"\n\tNew minMagnitude: {2}, maxMagnitude: {3}" +
+						"\n\tMagnitude: {4}",
+						this.GetType().Name,
+						digits,
+						magnitude >= 0 ? int.MinValue : (int)magnitude - 4 + digits,
+						magnitude >= 0 ? (int)magnitude - digits : int.MaxValue,
+						magnitude
+					));
 				}
 			}
 
@@ -198,103 +306,20 @@
 		}
 	}
 
-	public class VOID_DoubleValue : VOID_NumValue<double>, IVOID_NumericValue
+	public class VOID_DoubleValue : VOID_NumValue<double>
 	{
 		public VOID_DoubleValue(string Label, Func<double> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return this.Value;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI (this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_FloatValue : VOID_NumValue<float>, IVOID_NumericValue
+	}
+
+	public class VOID_FloatValue : VOID_NumValue<float>
 	{
 		public VOID_FloatValue(string Label, Func<float> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return (double)this.Value;
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-	public class VOID_IntValue : VOID_NumValue<int>, IVOID_NumericValue
+	}
+
+	public class VOID_IntValue : VOID_NumValue<int>
 	{
 		public VOID_IntValue(string Label, Func<int> ValueFunc, string Units) : base(Label, ValueFunc, Units) {}
-
-		public override double ToDouble ()
-		{
-			return (double)this.Value;
-		}
-
-		public override string ValueUnitString(string format) {
-			return this.Value.ToString(format) + this.Units;
-		}
-
-		public override string ToString(string format)
-		{
-			return string.Format (
-				"{0}: {1}{2}",
-				this.Label,
-				this.Value.ToString (format),
-				this.Units
-			);
-		}
-
-		public override string ToSIString(int digits = 3, int MinMagnitude = 0, int MaxMagnitude = int.MaxValue)
-		{
-			return string.Format (
-				"{0}{1}",
-				Tools.MuMech_ToSI ((double)this.Value, digits, MinMagnitude, MaxMagnitude),
-				this.Units
-			);
-		}
-	}
-
+	}
 
 	public class VOID_StrValue : VOID_DataValue<string>
 	{

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -1,28 +1,37 @@
+// VOID
 //
-//  VOID_EditorCore.cs
+// VOID_EditorCore.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using Engineer.VesselSimulator;
 using KSP;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -122,8 +131,8 @@
 
 			if (EditorLogic.SortedShipList.Count > 0)
 			{
-				SimManager.Instance.Gravity = 9.08665;
-				SimManager.Instance.TryStartSimulation();
+				SimManager.Gravity = VOID_Data.KerbinGee;
+				SimManager.TryStartSimulation();
 			}
 
 			this.CheckAndSave ();

--- a/VOID_EditorHUD.cs
+++ b/VOID_EditorHUD.cs
@@ -1,29 +1,38 @@
-//
-//  VOID_Hud.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/>.
-//
+// VOID
+//
+// VOID_EditorHUD.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 using Engineer.VesselSimulator;
 using KSP;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -40,6 +49,8 @@
 
 		protected GUIStyle labelStyle;
 
+		protected EditorVesselOverlays _vesselOverlays;
+
 		/*
 		 * Properties
 		 * */
@@ -58,6 +69,47 @@
 				}
 
 				this._colorIndex = value;
+			}
+		}
+
+		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;
 			}
 		}
 
@@ -89,14 +141,15 @@
 
 		public override void DrawGUI()
 		{
-			SimManager.Instance.RequestSimulation();
-
-			if (SimManager.Instance.LastStage == null)
+			SimManager.RequestSimulation();
+
+			if (SimManager.LastStage == null)
 			{
 				return;
 			}
 
 			float hudLeft;
+			StringBuilder hudString;
 
 			if (EditorLogic.fetch.editorScreen == EditorLogic.EditorScreen.Parts)
 			{
@@ -113,17 +166,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.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.LastStage.totalDeltaV));
+			hudString.Append("m/s");
+
+			hudString.Append('\n');
+
+			hudString.Append("Bottom Stage Delta-V");
+			hudString.Append(Tools.MuMech_ToSI(SimManager.LastStage.deltaV));
+			hudString.Append("m/s");
+
+			hudString.Append('\n');
+
+			hudString.Append("Bottom Stage T/W Ratio: ");
+			hudString.Append(SimManager.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
@@ -1,29 +1,38 @@
-//
-//  VOID_Hud.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/>.
-//
-
+// VOID
+//
+// VOID_HUD.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using Engineer.VesselSimulator;
 using KSP;
-using UnityEngine;
 using System;
 using System.Collections.Generic;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
 
 namespace VOID
 {
@@ -33,9 +42,20 @@
 		 * Fields
 		 * */
 		[AVOID_SaveValue("colorIndex")]
-		protected VOID_SaveValue<int> _colorIndex = 0;
-
-		protected List<Color> textColors = new List<Color>();
+		protected VOID_SaveValue<int> _colorIndex;
+
+		protected List<Color> textColors;
+
+		protected Rect leftHUDdefaultPos;
+		protected Rect rightHUDdefaultPos;
+
+		[AVOID_SaveValue("leftHUDPos")]
+		protected VOID_SaveValue<Rect> leftHUDPos;
+		[AVOID_SaveValue("rightHUDPos")]
+		protected VOID_SaveValue<Rect> rightHUDPos;
+
+		[AVOID_SaveValue("positionsLocked")]
+		protected VOID_SaveValue<bool> positionsLocked;
 
 		/*
 		 * Properties
@@ -66,6 +86,10 @@
 			this._Name = "Heads-Up Display";
 
 			this._Active.value = true;
+
+			this._colorIndex = 0;
+
+			this.textColors = new List<Color>();
 
 			this.textColors.Add(Color.green);
 			this.textColors.Add(Color.black);
@@ -77,59 +101,229 @@
 			this.textColors.Add(Color.cyan);
 			this.textColors.Add(Color.magenta);
 
-			VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle();
-			VOID_Core.Instance.LabelStyles["hud"].normal.textColor = this.textColors [this.ColorIndex];
+			this.leftHUDdefaultPos = new Rect(Screen.width * .375f - 300f, 0f, 300f, 90f);
+			this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+
+			this.rightHUDdefaultPos = new Rect(Screen.width * .625f, 0f, 300f, 90f);
+			this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+
+			this.positionsLocked = true;
 
 			Tools.PostDebugMessage ("VOID_HUD: Constructed.");
 		}
 
+		protected void leftHUDWindow(int id)
+		{
+			StringBuilder leftHUD;
+
+			leftHUD = new StringBuilder();
+
+			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperRight;
+
+			if (VOID_Core.Instance.powerAvailable)
+			{
+				leftHUD.AppendFormat("Primary: {0} Inc: {1}",
+					VOID_Data.primaryName.ValueUnitString(),
+					VOID_Data.orbitInclination.ValueUnitString("F3")
+				);
+				leftHUD.AppendFormat("\nObt Alt: {0} Obt Vel: {1}",
+					VOID_Data.orbitAltitude.ToSIString(),
+					VOID_Data.orbitVelocity.ToSIString()
+				);
+				leftHUD.AppendFormat("\nAp: {0} ETA {1}",
+					VOID_Data.orbitApoAlt.ToSIString(),
+					VOID_Data.timeToApo.ValueUnitString()
+				);
+				leftHUD.AppendFormat("\nPe: {0} ETA {1}",
+					VOID_Data.oribtPeriAlt.ToSIString(),
+					VOID_Data.timeToPeri.ValueUnitString()
+				);
+				leftHUD.AppendFormat("\nTot Δv: {0} Stg Δv: {1}",
+					VOID_Data.totalDeltaV.ToSIString(2),
+					VOID_Data.stageDeltaV.ToSIString(2)
+				);
+			}
+			else
+			{
+				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				leftHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+			GUILayout.Label(leftHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
+		protected void rightHUDWindow(int id)
+		{
+			StringBuilder rightHUD;
+
+			rightHUD = new StringBuilder();
+
+			VOID_Core.Instance.LabelStyles["hud"].alignment = TextAnchor.UpperLeft;
+
+			if (VOID_Core.Instance.powerAvailable)
+			{
+				rightHUD.AppendFormat("Biome: {0} Sit: {1}",
+					VOID_Data.currBiome.ValueUnitString(),
+					VOID_Data.expSituation.ValueUnitString()
+				);
+				rightHUD.AppendFormat("\nSrf Alt: {0} Srf Vel: {1}",
+					VOID_Data.trueAltitude.ToSIString(),
+					VOID_Data.surfVelocity.ToSIString()
+				);
+				rightHUD.AppendFormat("\nVer: {0} Hor: {1}",
+					VOID_Data.vertVelocity.ToSIString(),
+					VOID_Data.horzVelocity.ToSIString()
+				);
+				rightHUD.AppendFormat("\nLat: {0} Lon: {1}",
+					VOID_Data.surfLatitude.ValueUnitString(),
+					VOID_Data.surfLongitude.ValueUnitString()
+				);
+				rightHUD.AppendFormat("\nHdg: {0} Pit: {1}",
+					VOID_Data.vesselHeading.ValueUnitString(),
+					VOID_Data.vesselPitch.ToSIString(2)
+				);
+			}
+			else
+			{
+				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
+				rightHUD.Append(string.Intern("-- POWER LOST --"));
+			}
+
+
+			GUILayout.Label(rightHUD.ToString(), VOID_Core.Instance.LabelStyles["hud"], GUILayout.ExpandWidth(true));
+
+			if (!this.positionsLocked)
+			{
+				GUI.DragWindow();
+			}
+
+			GUI.BringWindowToBack(id);
+		}
+
 		public override void DrawGUI()
 		{
-			GUI.skin = VOID_Core.Instance.Skin;
-
-			if (VOID_Core.Instance.powerAvailable)
-			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
-
-				GUI.Label (
-					new Rect ((Screen.width * .2083f), 0, 300f, 70f),
-					"Obt Alt: " + Tools.MuMech_ToSI (vessel.orbit.altitude) + "m" +
-					" Obt Vel: " + Tools.MuMech_ToSI (vessel.orbit.vel.magnitude) + "m/s" +
-					"\nAp: " + Tools.MuMech_ToSI (vessel.orbit.ApA) + "m" +
-					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToAp) +
-					"\nPe: " + Tools.MuMech_ToSI (vessel.orbit.PeA) + "m" +
-					" ETA " + Tools.ConvertInterval (vessel.orbit.timeToPe) +
-					"\nInc: " + vessel.orbit.inclination.ToString ("F3") + "°" +
-					"\nPrimary: " + vessel.mainBody.bodyName,
-					VOID_Core.Instance.LabelStyles["hud"]);
-				// Toadicus edit: Added "Biome: " line to surf/atmo HUD
-				GUI.Label (
-					new Rect ((Screen.width * .625f), 0, 300f, 90f),
-					"Srf Alt: " + Tools.MuMech_ToSI (Tools.TrueAltitude (vessel)) + "m" +
-					" Srf Vel: " + Tools.MuMech_ToSI (vessel.srf_velocity.magnitude) + "m/s" +
-					"\nVer: " + Tools.MuMech_ToSI (vessel.verticalSpeed) + "m/s" +
-					" Hor: " + Tools.MuMech_ToSI (vessel.horizontalSrfSpeed) + "m/s" +
-					"\nLat: " + Tools.GetLatitudeString (vessel, "F3") +
-					" 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,
-					VOID_Core.Instance.LabelStyles["hud"]);
-			}
-			else
-			{
-				VOID_Core.Instance.LabelStyles["hud"].normal.textColor = Color.red;
-				GUI.Label (new Rect ((Screen.width * .2083f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
-				GUI.Label (new Rect ((Screen.width * .625f), 0, 300f, 70f), "-- POWER LOST --", VOID_Core.Instance.LabelStyles["hud"]);
-			}
+			if (!VOID_Core.Instance.LabelStyles.ContainsKey("hud"))
+			{
+				VOID_Core.Instance.LabelStyles["hud"] = new GUIStyle(GUI.skin.label);
+			}
+
+			VOID_Core.Instance.LabelStyles["hud"].normal.textColor = textColors [ColorIndex];
+
+			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
+			{
+				SimManager.RequestSimulation();
+			}
+
+			this.leftHUDPos.value = GUI.Window(
+				VOID_Core.Instance.windowID,
+				this.leftHUDPos,
+				this.leftHUDWindow,
+				GUIContent.none,
+				GUIStyle.none
+			);
+
+			this.rightHUDPos.value = GUI.Window(
+				VOID_Core.Instance.windowID,
+				this.rightHUDPos,
+				this.rightHUDWindow,
+				GUIContent.none,
+				GUIStyle.none
+			);
 		}
 
 		public override void DrawConfigurables()
 		{
-			if (GUILayout.Button ("Change HUD color", GUILayout.ExpandWidth (false)))
+			if (GUILayout.Button (string.Intern("Change HUD color"), GUILayout.ExpandWidth (false)))
 			{
 				++this.ColorIndex;
 			}
+
+			if (GUILayout.Button(string.Intern("Reset HUD Positions"), GUILayout.ExpandWidth(false)))
+			{
+				this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+				this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+			}
+
+			this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+				string.Intern("Lock HUD Positions"),
+				GUILayout.ExpandWidth(false));
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_StrValue expSituation = new VOID_StrValue(
+			"Situation",
+			new Func<string> (() => VOID_Core.Instance.vessel.GetExperimentSituation().HumanString())
+		);
+
+		public static readonly VOID_DoubleValue vesselPitch = new VOID_DoubleValue(
+			"Pitch",
+			() => core.vessel.getSurfacePitch(),
+			"°"
+		);
+
+		public static readonly VOID_DoubleValue stageMassFlow = new VOID_DoubleValue(
+			"Stage Mass Flow",
+			delegate()
+			{
+			if (SimManager.LastStage == null)
+				{
+					return double.NaN;
+				}
+
+				double stageIsp = SimManager.LastStage.isp;
+				double stageThrust = SimManager.LastStage.actualThrust;
+
+				return stageThrust / (stageIsp * KerbinGee);
+			},
+			"Mg/s"
+		);
+
+		public static readonly VOID_DoubleValue burnTimeCompleteAtNode = new VOID_DoubleValue(
+			"Full burn time to complete at node",
+			delegate()
+			{
+			if (SimManager.LastStage == null)
+				{
+					return double.NaN;
+				}
+			    
+				double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
+				double stageThrust = SimManager.LastStage.actualThrust;
+
+				return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		public static readonly VOID_DoubleValue burnTimeHalfDoneAtNode = new VOID_DoubleValue(
+			"Full burn time to be half done at node",
+			delegate()
+			{
+				if (SimManager.LastStage == null)
+				{
+					return double.NaN;
+				}
+			    
+				double nextManeuverDV = core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude / 2d;
+				double stageThrust = SimManager.LastStage.actualThrust;
+
+				return burnTime(nextManeuverDV, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
+		{
+			return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
 		}
 	}
 }

--- /dev/null
+++ b/VOID_Localization.cs
@@ -1,1 +1,36 @@
+// VOID
+//
+// VOID_Localization.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+public static class VOID_Localization
+{
+	public static string void_primary = "Primary";
+	public static string void_altitude_asl = "Altitude (ASL)";
+	public static string void_velocity = "Velocity";
+	public static string void_apoapsis = "Apoapsis";
+	public static string void_periapsis = "Periapsis";
+}

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -1,27 +1,36 @@
-//
-//  VOID_Module.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/>.
+// VOID
+//
+// VOID_Module.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -199,39 +208,39 @@
 
 		public virtual void ModuleWindow(int _)
 		{
-			if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
-				foreach (var fieldinfo in this.GetType().GetFields(
-					BindingFlags.Instance |
-					BindingFlags.NonPublic |
-					BindingFlags.Public |
-					BindingFlags.FlattenHierarchy
-				))
-				{
-					object field = null;
-
-					try
-					{
-						field = fieldinfo.GetValue (this);
-					}
-					catch (NullReferenceException) {
-						Tools.PostDebugMessage(string.Format(
-							"{0}: caught NullReferenceException, could not get value for field {1}.",
-							this.GetType().Name,
-							fieldinfo.Name
-						));
-					}
-
-					if (field == null) {
-						continue;
-					}
-
-					if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
-						(field as IVOID_DataValue).Refresh ();
-					}
-				}
-
-				this.lastUpdate = VOID_Core.Instance.updateTimer;
-			}
+//			if (VOID_Core.Instance.updateTimer - this.lastUpdate > VOID_Core.Instance.updatePeriod) {
+//				foreach (var fieldinfo in this.GetType().GetFields(
+//					BindingFlags.Instance |
+//					BindingFlags.NonPublic |
+//					BindingFlags.Public |
+//					BindingFlags.FlattenHierarchy
+//				))
+//				{
+//					object field = null;
+//
+//					try
+//					{
+//						field = fieldinfo.GetValue (this);
+//					}
+//					catch (NullReferenceException) {
+//						Tools.PostDebugMessage(string.Format(
+//							"{0}: caught NullReferenceException, could not get value for field {1}.",
+//							this.GetType().Name,
+//							fieldinfo.Name
+//						));
+//					}
+//
+//					if (field == null) {
+//						continue;
+//					}
+//
+//					if (typeof(IVOID_DataValue).IsAssignableFrom (field.GetType ())) {
+//						(field as IVOID_DataValue).Refresh ();
+//					}
+//				}
+//
+//				this.lastUpdate = VOID_Core.Instance.updateTimer;
+//			}
 		}
 
 		public override void DrawGUI()

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -1,25 +1,34 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_Orbital.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -33,197 +42,201 @@
 		protected long _precisionValues = 230584300921369395;
 		protected IntCollection precisionValues;
 
-		protected VOID_StrValue primaryName = new VOID_StrValue (
-			VOIDLabels.void_primary,
+		public VOID_Orbital()
+		{
+			this._Name = "Orbital Information";
+
+			this.WindowPos.x = Screen.width - 520f;
+			this.WindowPos.y = 250f;
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			base.ModuleWindow (_);
+
+			int idx = 0;
+
+            GUILayout.BeginVertical();
+
+			VOID_Data.primaryName.DoGUIHorizontal ();
+
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx]= (ushort)VOID_Data.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			VOID_Data.timeToApo.DoGUIHorizontal();
+
+			this.precisionValues [idx]= (ushort)VOID_Data.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			VOID_Data.timeToPeri.DoGUIHorizontal();
+
+			VOID_Data.orbitInclination.DoGUIHorizontal("F3");
+
+			this.precisionValues [idx]= (ushort)VOID_Data.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
+
+			if (this.toggleExtended)
+            {
+				VOID_Data.orbitPeriod.DoGUIHorizontal();
+
+				this.precisionValues [idx]= (ushort)VOID_Data.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
+				idx++;
+
+				VOID_Data.eccentricity.DoGUIHorizontal("F4");
+
+				VOID_Data.meanAnomaly.DoGUIHorizontal("F3");
+
+				VOID_Data.trueAnomaly.DoGUIHorizontal("F3");
+
+				VOID_Data.eccAnomaly.DoGUIHorizontal("F3");
+
+				VOID_Data.longitudeAscNode.DoGUIHorizontal("F3");
+
+				VOID_Data.argumentPeriapsis.DoGUIHorizontal("F3");
+
+				VOID_Data.localSiderealLongitude.DoGUIHorizontal("F3");
+            }
+
+            GUILayout.EndVertical();
+            GUI.DragWindow();
+		}
+
+		public override void LoadConfig ()
+		{
+			base.LoadConfig ();
+
+			this.precisionValues = new IntCollection (4, this._precisionValues);
+		}
+
+		public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
+		{
+			this._precisionValues = this.precisionValues.collection;
+
+			base._SaveToConfig (config);
+		}
+	}
+
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_StrValue primaryName = new VOID_StrValue (
+			VOID_Localization.void_primary,
 			new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
 		);
 
-		protected VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
+		public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
 			"Altitude (ASL)",
 			new Func<double> (() => VOID_Core.Instance.vessel.orbit.altitude),
 			"m"
 		);
 
-		protected VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
-			VOIDLabels.void_velocity,
+		public static readonly VOID_DoubleValue orbitVelocity = new VOID_DoubleValue (
+			VOID_Localization.void_velocity,
 			new Func<double> (() => VOID_Core.Instance.vessel.orbit.vel.magnitude),
 			"m/s"
 		);
 
-		protected VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
-			VOIDLabels.void_apoapsis,
+		public static readonly VOID_DoubleValue orbitApoAlt = new VOID_DoubleValue(
+			VOID_Localization.void_apoapsis,
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.ApA),
 			"m"
 		);
 
-		protected VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
-			VOIDLabels.void_periapsis,
+		public static readonly VOID_DoubleValue oribtPeriAlt = new VOID_DoubleValue(
+			VOID_Localization.void_periapsis,
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.PeA),
 			"m"
 		);
 
-		protected VOID_StrValue timeToApo = new VOID_StrValue(
-		"Time to Apoapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
-		);
-
-		protected VOID_StrValue timeToPeri = new VOID_StrValue(
+		public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
+			"Time to Apoapsis",
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+		);
+
+		public static readonly VOID_StrValue timeToPeri = new VOID_StrValue(
 			"Time to Periapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
-		);
-
-		protected VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
+		);
+
+		public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
 			"Inclination",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.inclination),
 			"°"
 		);
 
-		protected VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue gravityAccel = new VOID_DoubleValue(
 			"Gravity",
 			delegate()
-			{
-				double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
+		{
+			double orbitRadius = VOID_Core.Instance.vessel.mainBody.Radius +
 				VOID_Core.Instance.vessel.mainBody.GetAltitude(VOID_Core.Instance.vessel.findWorldCenterOfMass());
-				return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
+			return (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
 				Math.Pow(orbitRadius, 2);
-			},
+		},
 			"m/s²"
 		);
 
-		protected VOID_StrValue orbitPeriod = new VOID_StrValue(
+		public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
 			"Period",
-			 new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
-		);
-
-		protected VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+		);
+
+		public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
 			"Semi-Major Axis",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.semiMajorAxis),
 			"m"
 		);
 
-		protected VOID_DoubleValue eccentricity = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue eccentricity = new VOID_DoubleValue(
 			"Eccentricity",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricity),
 			""
 		);
 
-		protected VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue meanAnomaly = new VOID_DoubleValue(
 			"Mean Anomaly",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.meanAnomaly * 180d / Math.PI),
 			"°"
 		);
 
-		protected VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue trueAnomaly = new VOID_DoubleValue(
 			"True Anomaly",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.trueAnomaly),
 			"°"
 		);
 
-		protected VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
-		"Eccentric Anomaly",
+		public static readonly VOID_DoubleValue eccAnomaly = new VOID_DoubleValue(
+			"Eccentric Anomaly",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.eccentricAnomaly * 180d / Math.PI),
 			"°"
 		);
 
-		protected VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue longitudeAscNode = new VOID_DoubleValue(
 			"Long. Ascending Node",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.LAN),
 			"°"
 		);
 
-		protected VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue argumentPeriapsis = new VOID_DoubleValue(
 			"Argument of Periapsis",
 			new Func<double>(() => VOID_Core.Instance.vessel.orbit.argumentOfPeriapsis),
 			"°"
-	    );
-
-		protected VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
+		);
+
+		public static readonly VOID_DoubleValue localSiderealLongitude = new VOID_DoubleValue(
 			"Local Sidereal Longitude",
-			new Func<double>(() => Tools.FixDegreeDomain(
+			new Func<double>(() => VOID_Tools.FixDegreeDomain(
 				VOID_Core.Instance.vessel.longitude + VOID_Core.Instance.vessel.orbit.referenceBody.rotationAngle)),
 			"°"
 		);
-
-		public VOID_Orbital()
-		{
-			this._Name = "Orbital Information";
-
-			this.WindowPos.x = Screen.width - 520f;
-			this.WindowPos.y = 250f;
-		}
-
-		public override void ModuleWindow(int _)
-		{
-			base.ModuleWindow (_);
-
-			int idx = 0;
-
-            GUILayout.BeginVertical();
-
-			this.primaryName.DoGUIHorizontal ();
-
-			this.precisionValues [idx]= (ushort)this.orbitAltitude.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx]= (ushort)this.orbitVelocity.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx]= (ushort)this.orbitApoAlt.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.timeToApo.DoGUIHorizontal();
-
-			this.precisionValues [idx]= (ushort)this.oribtPeriAlt.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.timeToPeri.DoGUIHorizontal();
-
-			this.orbitInclination.DoGUIHorizontal("F3");
-
-			this.precisionValues [idx]= (ushort)this.gravityAccel.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.toggleExtended.value = GUILayout.Toggle(this.toggleExtended, "Extended info");
-
-			if (this.toggleExtended)
-            {
-				this.orbitPeriod.DoGUIHorizontal();
-
-				this.precisionValues [idx]= (ushort)this.semiMajorAxis.DoGUIHorizontal (this.precisionValues [idx]);
-				idx++;
-
-				this.eccentricity.DoGUIHorizontal("F4");
-
-				this.meanAnomaly.DoGUIHorizontal("F3");
-
-				this.trueAnomaly.DoGUIHorizontal("F3");
-
-				this.eccAnomaly.DoGUIHorizontal("F3");
-
-				this.longitudeAscNode.DoGUIHorizontal("F3");
-
-				this.argumentPeriapsis.DoGUIHorizontal("F3");
-
-				this.localSiderealLongitude.DoGUIHorizontal("F3");
-            }
-
-            GUILayout.EndVertical();
-            GUI.DragWindow();
-		}
-
-		public override void LoadConfig ()
-		{
-			base.LoadConfig ();
-
-			this.precisionValues = new IntCollection (4, this._precisionValues);
-		}
-
-		public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
-		{
-			this._precisionValues = this.precisionValues.collection;
-
-			base._SaveToConfig (config);
-		}
 	}
 }
 

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -1,27 +1,36 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_Rendezvous.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -59,13 +68,13 @@
 			if (FlightGlobals.fetch.VesselTarget != null)
 			{
 				//a KSP Target (body or vessel) is selected
-				if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.Direction)
+				if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.Direction)
 				{
 					//a Body is selected
 					rendezbody = vessel.patchedConicSolver.targetBody;
 					display_rendezvous_info(null, rendezbody);
 				}
-				else if (FlightGlobals.fetch.vesselTargetMode == FlightGlobals.VesselTargetModes.DirectionAndVelocity)
+				else if (FlightGlobals.fetch.vesselTargetMode == VesselTargetModes.DirectionAndVelocity)
 				{
 					//a Vessel is selected
 					rendezvessel = FlightGlobals.fetch.VesselTarget.GetVessel();
@@ -138,8 +147,8 @@
 				{
 					// Toadicus edit: added local sidereal longitude.
 					// Toadicus edit: added local sidereal longitude.
-					double LSL = vessel.longitude + vessel.orbit.referenceBody.rotationAngle;
-					LSL = Tools.FixDegreeDomain (LSL);
+					double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
+					LSL = VOID_Tools.FixDegreeDomain (LSL);
 
 					//display orbital info for orbiting/flying/suborbital/escaping vessels only
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -187,7 +196,7 @@
 					{
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 						GUILayout.Label("Period:");
-						GUILayout.Label(Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
+						GUILayout.Label(VOID_Tools.ConvertInterval(v.orbit.period), GUILayout.ExpandWidth(false));
 						GUILayout.EndHorizontal();
 
 						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -238,12 +247,12 @@
 				{
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Latitude:");
-					GUILayout.Label(Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLatitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 					GUILayout.Label("Longitude:");
-					GUILayout.Label(Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
+					GUILayout.Label(VOID_Tools.GetLongitudeString(vessel), GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -288,28 +297,28 @@
 				//SUN2PLANET:
 				if (vessel.mainBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_SUN2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] SUN2PLANET OK");
 				}
 
 				//PLANET2PLANET
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2PLANET(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2PLANET OK");
 				}
 
 				//PLANET2MOON
 				else if (vessel.mainBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody)
 				{
-					Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_PLANET2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] PLANET2MOON OK");
 				}
 
 				//MOON2MOON
 				else if (vessel.mainBody.referenceBody.referenceBody.bodyName == "Sun" && cb.referenceBody == vessel.mainBody.referenceBody)
 				{
-					Tools.display_transfer_angles_MOON2MOON(cb, vessel);
+					VOID_Tools.display_transfer_angles_MOON2MOON(cb, vessel);
 					//if (debugging) Debug.Log("[VOID] MOON2MOON OK");
 				}
 

--- a/VOID_SaveValue.cs
+++ b/VOID_SaveValue.cs
@@ -1,26 +1,35 @@
+// VOID
 //
-//  VOID_Config.cs
+// VOID_SaveValue.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
 using System;
 using System.Collections.Generic;
-using KSP;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID

--- a/VOID_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -1,25 +1,34 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_SurfAtmo.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -30,7 +39,77 @@
 		protected long _precisionValues = 230584300921369395;
 		protected IntCollection precisionValues;
 
-		protected VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
+		public VOID_SurfAtmo()
+		{
+			this._Name = "Surface & Atmospheric Information";
+
+			this.WindowPos.x = Screen.width - 260f;
+			this.WindowPos.y = 85;
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			base.ModuleWindow (_);
+
+			int idx = 0;
+
+			GUILayout.BeginVertical();
+
+			this.precisionValues [idx]= (ushort)VOID_Data.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			VOID_Data.surfLatitude.DoGUIHorizontal ();
+
+			VOID_Data.surfLongitude.DoGUIHorizontal ();
+
+			VOID_Data.vesselHeading.DoGUIHorizontal ();
+
+			this.precisionValues [idx]= (ushort)VOID_Data.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx]= (ushort)VOID_Data.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx]= (ushort)VOID_Data.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			this.precisionValues [idx]= (ushort)VOID_Data.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			VOID_Data.temperature.DoGUIHorizontal ("F2");
+
+			VOID_Data.atmDensity.DoGUIHorizontal (3);
+
+			VOID_Data.atmPressure.DoGUIHorizontal ("F2");
+
+			this.precisionValues [idx]= (ushort)VOID_Data.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
+			idx++;
+
+			// Toadicus edit: added Biome
+			VOID_Data.currBiome.DoGUIHorizontal ();
+
+			GUILayout.EndVertical();
+			GUI.DragWindow();
+		}
+
+		public override void LoadConfig ()
+		{
+			base.LoadConfig ();
+
+			this.precisionValues = new IntCollection (4, this._precisionValues);
+		}
+
+		public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
+		{
+			this._precisionValues = this.precisionValues.collection;
+
+			base._SaveToConfig (config);
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_DoubleValue trueAltitude = new VOID_DoubleValue(
 			"Altitude (true)",
 			delegate()
 			{
@@ -44,149 +123,83 @@
 			"m"
 		);
 
-		protected VOID_StrValue surfLatitude = new VOID_StrValue(
+		public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
 			"Latitude",
-			new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
-		);
-
-		protected VOID_StrValue surfLongitude = new VOID_StrValue(
+			new Func<string> (() => VOID_Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+		);
+
+		public static readonly VOID_StrValue surfLongitude = new VOID_StrValue(
 			"Longitude",
-			new Func<string> (() => Tools.GetLongitudeString(VOID_Core.Instance.vessel))
-		);
-
-		protected VOID_StrValue vesselHeading = new VOID_StrValue(
+			new Func<string> (() => VOID_Tools.GetLongitudeString(VOID_Core.Instance.vessel))
+		);
+
+		public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
 			"Heading",
 			delegate()
-			{
-				double heading = Tools.MuMech_get_heading(VOID_Core.Instance.vessel);
-				string cardinal = Tools.get_heading_text(heading);
-
-				return string.Format(
-					"{0}° {1}",
-					heading.ToString("F2"),
-					cardinal
-				);
-			}
-		);
-
-		protected VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
+		{
+			double heading = core.vessel.getSurfaceHeading();
+			string cardinal = VOID_Tools.get_heading_text(heading);
+
+			return string.Format(
+				"{0}° {1}",
+				heading.ToString("F2"),
+				cardinal
+			);
+		}
+		);
+
+		public static readonly VOID_DoubleValue terrainElevation = new VOID_DoubleValue(
 			"Terrain elevation",
 			new Func<double> (() => VOID_Core.Instance.vessel.terrainAltitude),
 			"m"
 		);
 
-		protected VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue surfVelocity = new VOID_DoubleValue(
 			"Surface velocity",
 			new Func<double> (() => VOID_Core.Instance.vessel.srf_velocity.magnitude),
 			"m/s"
 		);
 
-		protected VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue vertVelocity = new VOID_DoubleValue(
 			"Vertical speed",
 			new Func<double> (() => VOID_Core.Instance.vessel.verticalSpeed),
 			"m/s"
 		);
 
-		protected VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue horzVelocity = new VOID_DoubleValue(
 			"Horizontal speed",
 			new Func<double> (() => VOID_Core.Instance.vessel.horizontalSrfSpeed),
 			"m/s"
 		);
 
-		protected VOID_FloatValue temperature = new VOID_FloatValue(
+		public static readonly VOID_FloatValue temperature = new VOID_FloatValue(
 			"Temperature",
 			new Func<float> (() => VOID_Core.Instance.vessel.flightIntegrator.getExternalTemperature()),
 			"°C"
 		);
 
-		protected VOID_DoubleValue atmDensity = new VOID_DoubleValue (
+		public static readonly VOID_DoubleValue atmDensity = new VOID_DoubleValue (
 			"Atmosphere Density",
 			new Func<double> (() => VOID_Core.Instance.vessel.atmDensity * 1000f),
 			"g/m³"
 		);
 
-		protected VOID_DoubleValue atmPressure = new VOID_DoubleValue (
+		public static readonly VOID_DoubleValue atmPressure = new VOID_DoubleValue (
 			"Pressure",
 			new Func<double> (() => VOID_Core.Instance.vessel.staticPressure),
 			"atm"
 		);
 
-		protected VOID_FloatValue atmLimit = new VOID_FloatValue(
+		public static readonly VOID_FloatValue atmLimit = new VOID_FloatValue(
 			"Atmosphere Limit",
 			new Func<float> (() => VOID_Core.Instance.vessel.mainBody.maxAtmosphereAltitude),
 			"m"
 		);
 
-		protected VOID_StrValue currBiome = new VOID_StrValue(
+		public static readonly VOID_StrValue currBiome = new VOID_StrValue(
 			"Biome",
-			new Func<string> (() => Tools.Toadicus_GetAtt(VOID_Core.Instance.vessel).name)
-		);
-
-		public VOID_SurfAtmo()
-		{
-			this._Name = "Surface & Atmospheric Information";
-
-			this.WindowPos.x = Screen.width - 260f;
-			this.WindowPos.y = 85;
-		}
-
-		public override void ModuleWindow(int _)
-		{
-			base.ModuleWindow (_);
-
-			int idx = 0;
-
-			GUILayout.BeginVertical();
-
-			this.precisionValues [idx]= (ushort)this.trueAltitude.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.surfLatitude.DoGUIHorizontal ();
-
-			this.surfLongitude.DoGUIHorizontal ();
-
-			this.vesselHeading.DoGUIHorizontal ();
-
-			this.precisionValues [idx]= (ushort)this.terrainElevation.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx]= (ushort)this.surfVelocity.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx]= (ushort)this.vertVelocity.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.precisionValues [idx]= (ushort)this.horzVelocity.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			this.temperature.DoGUIHorizontal ("F2");
-
-			this.atmDensity.DoGUIHorizontal (3);
-
-			this.atmPressure.DoGUIHorizontal ("F2");
-
-			this.precisionValues [idx]= (ushort)this.atmLimit.DoGUIHorizontal (this.precisionValues [idx]);
-			idx++;
-
-			// Toadicus edit: added Biome
-			this.currBiome.DoGUIHorizontal ();
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
-
-		public override void LoadConfig ()
-		{
-			base.LoadConfig ();
-
-			this.precisionValues = new IntCollection (4, this._precisionValues);
-		}
-
-		public override void _SaveToConfig (KSP.IO.PluginConfiguration config)
-		{
-			this._precisionValues = this.precisionValues.collection;
-
-			base._SaveToConfig (config);
-		}
+			new Func<string> (() => VOID_Tools.GetBiome(VOID_Core.Instance.vessel).name)
+		);
+
 	}
 }

file:b/VOID_Tools.cs (new)
--- /dev/null
+++ b/VOID_Tools.cs
@@ -1,1 +1,740 @@
-
+// VOID
+//
+// VOID_Tools.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+using KSP;
+using System;
+using UnityEngine;
+
+namespace VOID
+{
+	public static partial class VOID_Tools
+	{
+		#region VESSEL_EXTENSIONS_SCIENCE
+		public static CBAttributeMap.MapAttribute GetBiome(this Vessel vessel)
+		{
+			CBAttributeMap.MapAttribute mapAttribute;
+
+			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)
+				{
+					lon += 2d * Math.PI;
+				}
+
+				float v = (float)(lat / Math.PI) + 0.5f;
+				float u = (float)(lon / (2d * Math.PI));
+
+				Color pixelBilinear = BiomeMap.Map.GetPixelBilinear(u, v);
+				mapAttribute = BiomeMap.defaultAttribute;
+
+				if (BiomeMap.Map != null)
+				{
+					if (BiomeMap.exactSearch)
+					{
+						for (int i = 0; i < BiomeMap.Attributes.Length; ++i)
+						{
+							if (pixelBilinear == BiomeMap.Attributes[i].mapColor)
+							{
+								mapAttribute = BiomeMap.Attributes[i];
+							}
+						}
+					}
+					else
+					{
+						float zero = 0;
+						float num = 1 / zero;
+						for (int j = 0; j < BiomeMap.Attributes.Length; ++j)
+						{
+							Color mapColor = BiomeMap.Attributes[j].mapColor;
+							float sqrMagnitude = ((Vector4)(mapColor - pixelBilinear)).sqrMagnitude;
+							if (sqrMagnitude < num)
+							{
+								bool testCase = true;
+								if (BiomeMap.nonExactThreshold != -1)
+								{
+									testCase = (sqrMagnitude < BiomeMap.nonExactThreshold);
+								}
+								if (testCase)
+								{
+									mapAttribute = BiomeMap.Attributes[j];
+									num = sqrMagnitude;
+								}
+							}
+						}
+					}
+				}
+				*/
+			}
+			catch (NullReferenceException)
+			{
+				mapAttribute = new CBAttributeMap.MapAttribute();
+				mapAttribute.name = "N/A";
+			}
+
+			return mapAttribute;
+		}
+
+		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";
+			}
+		}
+		#endregion
+
+		#region VESSEL_EXTENSIONS_LAT_LONG
+		public static string GetLongitudeString(this Vessel vessel, string format = "F4")
+		{
+			string dir_long = "W";
+			double v_long = vessel.longitude;
+
+			v_long = FixDegreeDomain(v_long);
+
+			if (v_long < -180d)
+			{
+				v_long += 360d;
+			}
+			if (v_long >= 180)
+			{
+				v_long -= 360d;
+			}
+
+			if (v_long > 0)
+				dir_long = "E";
+
+			return string.Format("{0}° {1}", Math.Abs(v_long).ToString(format), dir_long);
+		}
+
+		public static string GetLatitudeString(this Vessel vessel, string format = "F4")
+		{
+			string dir_lat = "S";
+			double v_lat = vessel.latitude;
+			if (v_lat > 0)
+				dir_lat = "N";
+
+			return string.Format("{0}° {1}", Math.Abs(v_lat).ToString(format), dir_lat);
+		}
+		#endregion
+
+		#region VESSEL_EXTENSIONS_GENERAL
+		public static double TrueAltitude(Vessel vessel)
+		{
+			double trueAltitude = vessel.orbit.altitude - vessel.terrainAltitude;
+
+			// 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)
+			{
+				trueAltitude = vessel.orbit.altitude;
+			}
+
+			return trueAltitude;
+		}
+
+		public static double Radius(this Vessel vessel)
+		{
+			double radius;
+
+			radius = vessel.altitude;
+
+			if (vessel.mainBody != null)
+			{
+				radius += vessel.mainBody.Radius;
+			}
+
+			return radius;
+		}
+		#endregion
+
+		#region GEOMETRY_UTILS
+		public static double FixAngleDomain(double Angle, bool Degrees = false)
+		{
+			double Extent = 2d * Math.PI;
+			if (Degrees)
+			{
+				Extent = 360d;
+			}
+
+			Angle = Angle % (Extent);
+			if (Angle < 0d)
+			{
+				Angle += Extent;
+			}
+
+			return Angle;
+		}
+
+		public static double FixDegreeDomain(double Angle)
+		{
+			return FixAngleDomain(Angle, true);
+		}
+		#endregion
+
+		public static string ConvertInterval(double seconds)
+		{
+			string format_1 = "{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:D2}.{5:D1}s";
+			string format_2 = "{0:D1}d {1:D2}h {2:D2}m {3:D2}.{4:D1}s";
+			string format_3 = "{0:D2}h {1:D2}m {2:D2}.{3:D1}s";
+
+			TimeSpan interval;
+
+			try
+			{
+				interval = TimeSpan.FromSeconds(seconds);
+			}
+			catch (OverflowException)
+			{
+				return "NaN";
+			}
+
+			int years = interval.Days / 365;
+
+			string output;
+			if (years > 0)
+			{
+				output = string.Format(format_1,
+					years,
+					interval.Days - (years * 365), //  subtract years * 365 for accurate day count
+					interval.Hours,
+					interval.Minutes,
+					interval.Seconds,
+					interval.Milliseconds.ToString().Substring(0, 1));
+			}
+			else if (interval.Days > 0)
+			{
+				output = string.Format(format_2,
+					interval.Days,
+					interval.Hours,
+					interval.Minutes,
+					interval.Seconds,
+					interval.Milliseconds.ToString().Substring(0, 1));
+			}
+			else
+			{
+				output = string.Format(format_3,
+					interval.Hours,
+					interval.Minutes,
+					interval.Seconds,
+					interval.Milliseconds.ToString().Substring(0, 1));
+			}
+			return output;
+		}
+
+		public static string UppercaseFirst(string s)
+		{
+			if (string.IsNullOrEmpty(s))
+			{
+				return string.Empty;
+			}
+			char[] a = s.ToCharArray();
+			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));
+			double T_transfer = (2 * Math.PI) * Math.Sqrt(Math.Pow((((r_target / 1000) + (r_current / 1000)) / 2), 3) / (grav_param / 1000000000));
+			return 360 * (0.5 - (T_transfer / (2 * T_target)));
+		}
+
+		public static double Younata_DeltaVToGetToOtherBody(double mu, double r1, double r2)
+		{
+			/*			
+            def deltaVToGetToOtherBody(mu, r1, r2):
+            # mu = gravity param of common orbiting body of r1 and r2
+            # (e.g. for mun to minmus, mu is kerbin's gravity param
+            # r1 = initial body's orbit radius
+            # r2 = target body's orbit radius
+		
+            # return value is km/s
+            sur1 = math.sqrt(mu / r1)
+            sr1r2 = math.sqrt(float(2*r2)/float(r1+r2))
+            mult = sr1r2 - 1
+            return sur1 * mult
+            */
+			double sur1, sr1r2, mult;
+			sur1 = Math.Sqrt(mu / r1);
+			sr1r2 = Math.Sqrt((2 * r2) / (r1 + r2));
+			mult = sr1r2 - 1;
+			return sur1 * mult;
+		}
+
+		public static double Younata_DeltaVToExitSOI(double mu, double r1, double r2, double v)
+		{
+			/*			
+            def deltaVToExitSOI(mu, r1, r2, v):
+            # mu = gravity param of current body
+            # r1 = current orbit radius
+            # r2 = SOI radius
+            # v = SOI exit velocity
+            foo = r2 * (v**2) - 2 * mu
+            bar = r1 * foo + (2 * r2 * mu)
+            r = r1*r2
+            return math.sqrt(bar / r)
+            */
+			double foo = r2 * Math.Pow(v, 2) - 2 * mu;
+			double bar = r1 * foo + (2 * r2 * mu);
+			double r = r1 * r2;
+			return Math.Sqrt(bar / r);
+		}
+
+		public static double Younata_TransferBurnPoint(double r, double v, double angle, double mu)
+		{
+			/*			
+            def transferBurnPoint(r, v, angle, mu):
+            # r = parking orbit radius
+            # v = ejection velocity
+            # angle = phase angle (from function phaseAngle())
+            # mu = gravity param of current body.
+            epsilon = ((v**2)/2) - (mu / r)
+            h = r * v * math.sin(angle)
+            e = math.sqrt(1 + ((2 * epsilon * h**2)/(mu**2)))
+            theta = math.acos(1.0 / e)
+            degrees = theta * (180.0 / math.pi)
+            return 180 - degrees
+            */
+			double epsilon, h, ee, theta, degrees;
+			epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
+			h = r * v * Math.Sin(angle);
+			ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
+			theta = Math.Acos(1.0 / ee);
+			degrees = theta * (180.0 / Math.PI);
+			return 180 - degrees;
+			// returns the ejection angle
+		}
+
+		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;
+			angle = angle * 360;
+			return angle;
+		}
+
+		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;
+			return eangle;
+		}
+
+		public static double mrenigma03_calcphase(Vessel vessel, CelestialBody target)   //calculates phase angle between the current body and target body
+		{
+			Vector3d vecthis = new Vector3d();
+			Vector3d vectarget = new Vector3d();
+			vectarget = target.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+
+			if ((vessel.mainBody.name == "Sun") || (vessel.mainBody.referenceBody.referenceBody.name == "Sun"))
+			{
+				vecthis = vessel.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+			}
+			else
+			{
+				vecthis = vessel.mainBody.orbit.getRelativePositionAtUT(Planetarium.GetUniversalTime());
+			}
+
+			vecthis = Vector3d.Project(new Vector3d(vecthis.x, 0, vecthis.z), vecthis);
+			vectarget = Vector3d.Project(new Vector3d(vectarget.x, 0, vectarget.z), vectarget);
+
+			Vector3d prograde = new Vector3d();
+			prograde = Quaternion.AngleAxis(90, Vector3d.forward) * vecthis;
+
+			double phase = Vector3d.Angle(vecthis, vectarget);
+
+			if (Vector3d.Angle(prograde, vectarget) > 90)
+				phase = 360 - phase;
+
+			return (phase + 360) % 360;
+		}
+
+		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;
+			}
+			else if (transfer_angle > 0)
+			{
+				if (curr_phase > 0)
+					return curr_phase;
+				else if (curr_phase < 0)
+					return (360 + curr_phase);
+			}
+			return curr_phase;
+		}
+
+		public static double adjust_current_ejection_angle(double curr_ejection)
+		{
+			//curr_ejection WILL need to be adjusted once for all transfers as it returns values ranging -180 to 180
+			// need 0-360 instead
+			//
+			// ie i have -17 in the screenshot
+			// need it to show 343
+			//
+			// do this
+			//
+			// 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;
+
+		}
+
+		public static double adjust_transfer_ejection_angle(double trans_ejection, double trans_phase)
+		{
+			// if transfer_phase_angle < 0 its a lower transfer
+			//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;
+
+		}
+
+		public static void display_transfer_angles_SUN2PLANET(CelestialBody body, Vessel vessel)
+		{
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Phase angle (curr/trans):");
+			GUILayout.Label(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + VOID_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(
+				(VOID_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 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				(vessel.mainBody.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(vessel.mainBody.sphereOfInfluence / 1000),
+				Math.Abs(dv1)
+			);
+
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
+				(vessel.orbit.semiMajorAxis / 1000),
+				dv2,
+				(Math.PI / 2.0),
+				(vessel.mainBody.gravParameter / 1000000000)
+			);
+			double curr_ejection_angle = VOID_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 = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+				vessel.mainBody.orbit.semiMajorAxis,
+				body.orbit.semiMajorAxis,
+				vessel.mainBody.referenceBody.gravParameter
+			) % 360;
+			double curr_phase_angle = VOID_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 = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
+
+			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.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.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
+		{
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+
+			double trans_phase_angle = VOID_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(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
+				GUILayout.ExpandWidth(false)
+			);
+			GUILayout.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv1 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
+		{
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
+				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
+				(vessel.mainBody.orbit.semiMajorAxis / 1000),
+				(body.orbit.semiMajorAxis / 1000)
+			);
+			double dv2 = VOID_Tools.Younata_DeltaVToExitSOI(
+				(vessel.mainBody.gravParameter / 1000000000),
+				(vessel.orbit.semiMajorAxis / 1000),
+				(vessel.mainBody.sphereOfInfluence / 1000),
+				Math.Abs(dv1)
+			);
+			double trans_ejection_angle = VOID_Tools.Younata_TransferBurnPoint(
+				(vessel.orbit.semiMajorAxis / 1000),
+				dv2,
+				(Math.PI / 2.0),
+				(vessel.mainBody.gravParameter / 1000000000)
+			);
+
+			double curr_phase_angle = VOID_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 = VOID_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 = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
+				vessel.mainBody.orbit.semiMajorAxis,
+				body.orbit.semiMajorAxis,
+				vessel.mainBody.referenceBody.gravParameter
+			) % 360;
+
+			double adj_phase_angle = VOID_Tools.adjustCurrPhaseAngle(trans_phase_angle, curr_phase_angle);
+			//double adj_ejection_angle = adjustCurrEjectionAngle(trans_phase_angle, curr_ejection_angle);
+
+			//new stuff
+			//
+			double adj_trans_ejection_angle = VOID_Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
+			double adj_curr_ejection_angle = VOID_Tools.adjust_current_ejection_angle(curr_ejection_angle);
+			//
+			//
+
+			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.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.EndHorizontal();
+
+			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+			GUILayout.Label("Transfer velocity:");
+			GUILayout.Label((dv2 * 1000).ToString("F2") + "m/s", GUILayout.ExpandWidth(false));
+			GUILayout.EndHorizontal();
+		}
+
+		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 "";
+		}
+	}
+}
+
+

--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -1,26 +1,36 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_Transfer.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Collections.Generic;
+using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -58,7 +68,7 @@
 
 					if (selectedBodies.Contains(body))
 					{
-						Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
+						VOID_Tools.display_transfer_angles_SUN2PLANET(body, vessel);  //show phase angles for each selected body
 						tad_targeting(body);    //display Set/Unset Target button for each selected body
 					}
 			    }
@@ -81,7 +91,7 @@
 
 			            if (selectedBodies.Contains(body))
 			            {
-			                Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
+			                VOID_Tools.display_transfer_angles_PLANET2PLANET(body, vessel);
 			                tad_targeting(body);    //display Set/Unset Target button
 			            }
 			        }
@@ -100,7 +110,7 @@
 
 			        if (selectedBodies.Contains(body))
 			        {
-			            Tools.display_transfer_angles_PLANET2MOON(body, vessel);
+			            VOID_Tools.display_transfer_angles_PLANET2MOON(body, vessel);
 			            tad_targeting(body);    //display Set/Unset Target button
 			        }
 			    }
@@ -123,7 +133,7 @@
 
 						if (selectedBodies.Contains(body))
 						{
-							Tools.display_transfer_angles_MOON2MOON(body, vessel);
+							VOID_Tools.display_transfer_angles_MOON2MOON(body, vessel);
 							tad_targeting(body);    //display Set/Unset Target button
 						}
 					}

--- a/VOID_VesselInfo.cs
+++ b/VOID_VesselInfo.cs
@@ -1,52 +1,123 @@
-//
-//  VOID_Orbital.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/>.
+// VOID
+//
+// VOID_VesselInfo.cs
+//
+// Copyright © 2014, toadicus
+// All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
+//
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
+//
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
+//
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Collections.Generic;
 using UnityEngine;
 using Engineer.VesselSimulator;
+using Engineer.Extensions;
 
 namespace VOID
 {
 	public class VOID_VesselInfo : VOID_WindowModule
 	{
-		protected VOID_DoubleValue geeForce = new VOID_DoubleValue(
+		public VOID_VesselInfo() : base()
+		{
+			this._Name = "Vessel Information";
+
+			this.WindowPos.x = Screen.width - 260;
+			this.WindowPos.y = 450;
+		}
+
+		public override void ModuleWindow(int _)
+		{
+			base.ModuleWindow (_);
+
+			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
+			{
+				SimManager.RequestSimulation();
+			}
+
+			GUILayout.BeginVertical();
+
+			GUILayout.Label(
+				vessel.vesselName,
+				VOID_Core.Instance.LabelStyles["center_bold"],
+				GUILayout.ExpandWidth(true));
+
+			VOID_Data.geeForce.DoGUIHorizontal ("F2");
+
+			VOID_Data.partCount.DoGUIHorizontal ();
+
+			VOID_Data.totalMass.DoGUIHorizontal ("F3");
+
+			VOID_Data.resourceMass.DoGUIHorizontal ("F3");
+
+			VOID_Data.stageDeltaV.DoGUIHorizontal (3, false);
+
+			VOID_Data.totalDeltaV.DoGUIHorizontal (3, false);
+
+			VOID_Data.mainThrottle.DoGUIHorizontal ("F0");
+
+			VOID_Data.currmaxThrust.DoGUIHorizontal ();
+
+			VOID_Data.currmaxThrustWeight.DoGUIHorizontal ();
+
+			VOID_Data.surfaceThrustWeight.DoGUIHorizontal ("F2");
+
+			VOID_Data.intakeAirStatus.DoGUIHorizontal();
+
+			GUILayout.EndVertical();
+
+			GUI.DragWindow();
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static readonly VOID_DoubleValue geeForce = new VOID_DoubleValue(
 			"G-force",
 			new Func<double>(() => VOID_Core.Instance.vessel.geeForce),
 			"gees"
 		);
 
-		protected VOID_IntValue partCount = new VOID_IntValue(
+		public static readonly VOID_IntValue partCount = new VOID_IntValue(
 			"Parts",
 			new Func<int>(() => VOID_Core.Instance.vessel.Parts.Count),
 			""
 		);
 
-		protected VOID_DoubleValue totalMass = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue totalMass = new VOID_DoubleValue(
 			"Total Mass",
-			new Func<double>(() => VOID_Core.Instance.vessel.GetTotalMass()),
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			return SimManager.LastStage.totalMass;
+		},
 			"tons"
 		);
 
-		protected VOID_DoubleValue resourceMass = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue resourceMass = new VOID_DoubleValue(
 			"Resource Mass",
 			delegate()
 			{
@@ -60,45 +131,45 @@
 			"tons"
 		);
 
-		protected VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue stageDeltaV = new VOID_DoubleValue(
 			"DeltaV (Current Stage)",
 			delegate()
 			{
-				if (SimManager.Instance.Stages == null ||
-			    	SimManager.Instance.Stages.Length <= Staging.lastStage
-			    )
+				if (SimManager.Stages == null ||
+					SimManager.Stages.Length <= Staging.lastStage
+				)
 					return double.NaN;
-				return SimManager.Instance.Stages[Staging.lastStage].deltaV;
+				return SimManager.Stages[Staging.lastStage].deltaV;
 			},
 			"m/s"
 		);
 
-		protected VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue totalDeltaV = new VOID_DoubleValue(
 			"DeltaV (Total)",
 			delegate()
 			{
-				if (SimManager.Instance.Stages == null)
+				if (SimManager.Stages == null)
 					return double.NaN;
-				return SimManager.Instance.LastStage.totalDeltaV;
+				return SimManager.LastStage.totalDeltaV;
 			},
 			"m/s"
 		);
 
-		protected VOID_FloatValue mainThrottle = new VOID_FloatValue(
+		public static readonly VOID_FloatValue mainThrottle = new VOID_FloatValue(
 			"Throttle",
 			new Func<float>(() => VOID_Core.Instance.vessel.ctrlState.mainThrottle * 100f),
 			"%"
 		);
 
-		protected VOID_StrValue currmaxThrust = new VOID_StrValue(
+		public static readonly VOID_StrValue currmaxThrust = new VOID_StrValue(
 			"Thrust (curr/max)",
 			delegate()
 			{
-				if (SimManager.Instance.Stages == null)
+				if (SimManager.Stages == null)
 					return "N/A";
 
-				double currThrust = SimManager.Instance.LastStage.actualThrust;
-				double maxThrust = SimManager.Instance.LastStage.thrust;
+				double currThrust = SimManager.LastStage.actualThrust;
+				double maxThrust = SimManager.LastStage.thrust;
 
 				return string.Format(
 					"{0} / {1}",
@@ -108,21 +179,21 @@
 			}
 		);
 
-		protected VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
+		public static readonly VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
 			"T:W (curr/max)",
 			delegate()
 			{
-				if (SimManager.Instance.Stages == null)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return "N/A";
 
-				double currThrust = SimManager.Instance.LastStage.actualThrust;
-				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double currThrust = SimManager.LastStage.actualThrust;
+				double maxThrust = SimManager.LastStage.thrust;
+				double mass = SimManager.LastStage.totalMass;
 				double gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-				                 Math.Pow(
-					                 VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
-					                 2
-					                );
+					Math.Pow(
+						VOID_Core.Instance.vessel.mainBody.Radius + VOID_Core.Instance.vessel.altitude,
+						2
+					);
 				double weight = mass * gravity;
 
 				return string.Format(
@@ -133,17 +204,17 @@
 			}
 		);
 
-		protected VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
+		public static readonly VOID_DoubleValue surfaceThrustWeight = new VOID_DoubleValue(
 			"Max T:W @ surface",
 			delegate()
 			{
-				if (SimManager.Instance.Stages == null)
+			if (SimManager.Stages == null || SimManager.LastStage == null)
 					return double.NaN;
 
-				double maxThrust = SimManager.Instance.LastStage.thrust;
-				double mass = VOID_Core.Instance.vessel.GetTotalMass();
+				double maxThrust = SimManager.LastStage.thrust;
+				double mass = SimManager.LastStage.totalMass;
 				double gravity = (VOID_Core.Constant_G * VOID_Core.Instance.vessel.mainBody.Mass) /
-				                 Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
+					Math.Pow(VOID_Core.Instance.vessel.mainBody.Radius, 2);
 				double weight = mass * gravity;
 
 				return maxThrust / weight;
@@ -151,56 +222,63 @@
 			""
 		);
 
-		public VOID_VesselInfo() : base()
-		{
-			this._Name = "Vessel Information";
-
-			this.WindowPos.x = Screen.width - 260;
-			this.WindowPos.y = 450;
-		}
-
-		public override void ModuleWindow(int _)
-		{
-			base.ModuleWindow (_);
-
-			if ((TimeWarp.WarpMode == TimeWarp.Modes.LOW) || (TimeWarp.CurrentRate <= TimeWarp.MaxPhysicsRate))
-			{
-				SimManager.Instance.RequestSimulation();
-			}
-
-			Stage[] stages = SimManager.Instance.Stages;
-
-			GUILayout.BeginVertical();
-
-			GUILayout.Label(
-				vessel.vesselName,
-				VOID_Core.Instance.LabelStyles["center_bold"],
-				GUILayout.ExpandWidth(true));
-
-			this.geeForce.DoGUIHorizontal ("F2");
-
-			this.partCount.DoGUIHorizontal ();
-
-			this.totalMass.DoGUIHorizontal ("F1");
-
-			this.resourceMass.DoGUIHorizontal ("F1");
-
-			this.stageDeltaV.DoGUIHorizontal (3, false);
-
-			this.totalDeltaV.DoGUIHorizontal (3, false);
-
-			this.mainThrottle.DoGUIHorizontal ("F0");
-
-			this.currmaxThrust.DoGUIHorizontal ();
-
-			this.currmaxThrustWeight.DoGUIHorizontal ();
-
-			this.surfaceThrustWeight.DoGUIHorizontal ("F2");
-
-			GUILayout.EndVertical();
-			GUI.DragWindow();
-		}
+		public static readonly 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.enabled)
+					{
+						List<Propellant> propellantList = null;
+
+						if (part.HasModule<ModuleEngines>())
+						{
+							propellantList = part.GetModule<ModuleEngines>().propellants;
+						}
+						else if (part.HasModule<ModuleEnginesFX>())
+						{
+							propellantList = part.GetModule<ModuleEnginesFX>().propellants;
+						}
+							
+						if (propellantList != null)
+						{
+							foreach (Propellant propellant in propellantList)
+							{
+								if (propellant.name == "IntakeAir")
+								{
+									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);
+			}
+		);
 	}
 }
 
-

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -1,26 +1,35 @@
+// VOID
 //
-//  VOID_Orbital.cs
+// VOID_VesselRegister.cs
 //
-//  Author:
-//       toadicus <>
+// Copyright © 2014, toadicus
+// All rights reserved.
 //
-//  Copyright (c) 2013 toadicus
+// Redistribution and use in source and binary forms, with or without modification,
+// are permitted provided that the following conditions are met:
 //
-//  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.
+// 1. Redistributions of source code must retain the above copyright notice,
+//    this list of conditions and the following disclaimer.
 //
-//  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.
+// 2. Redistributions in binary form must reproduce the above copyright notice,
+//    this list of conditions and the following disclaimer in the documentation and/or other
+//    materials provided with the distribution.
 //
-//  You should have received a copy of the GNU General Public License
-//  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+// 3. Neither the name of the copyright holder nor the names of its contributors may be used
+//    to endorse or promote products derived from this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 using KSP;
 using System;
 using System.Linq;
+using ToadicusTools;
 using UnityEngine;
 
 namespace VOID
@@ -106,7 +115,7 @@
 
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label(
-				Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
+				VOID_Tools.UppercaseFirst(vesselSituation) + " " + selectedVesselType.ToString() + "s  @ " + seletedBody.bodyName,
 				VOID_Core.Instance.LabelStyles["center"],
 				GUILayout.ExpandWidth(true));
 			GUILayout.EndHorizontal();