Moved from Math.Pow to direct multiplication throughout.
Moved from Math.Pow to direct multiplication throughout.

--- /dev/null
+++ b/Properties/AssemblyInfo.cs
@@ -1,1 +1,48 @@
+// VOID
+//
+// AssemblyInfo.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.Reflection;
+using System.Runtime.CompilerServices;
 
+[assembly: KSPAssemblyDependency("ToadicusTools", 0, 0)]
+[assembly: KSPAssemblyDependency("VesselSimulator", 0, 0)]
+
+// Information about this assembly is defined by the following attributes.
+// Change them to the values specific to your project.
+[assembly: AssemblyTitle("VOID")]
+[assembly: AssemblyDescription("A KSP mod that provides at-a-glance information about Vessels, Orbits, and their states.")]
+[assembly: AssemblyCopyright("toadicus")]
+// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
+// The form "{Major}.{Minor}.*" will automatically update the build and revision,
+// and "{Major}.{Minor}.{Build}.*" will update just the revision.
+[assembly: AssemblyVersion("0.11.0.*")]
+// The following attributes are used to specify the signing key for the assembly,
+// if desired. See the Mono documentation for more information about signing.
+//[assembly: AssemblyDelaySign(false)]
+//[assembly: AssemblyKeyFile("")]
+
+

file:b/VOID.csproj (new)
--- /dev/null
+++ b/VOID.csproj
@@ -1,1 +1,129 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug_win</Configuration>
+    <ProductVersion>8.0.30703</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{45ACC1CC-942C-4A66-BFC7-8BE375938B18}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <RootNamespace>VOID</RootNamespace>
+    <AssemblyName>VOID</AssemblyName>
+    <CodePage>65001</CodePage>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ReleaseVersion>0.11</ReleaseVersion>
+    <SynchReleaseVersion>false</SynchReleaseVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_win|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG; TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_win|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <DefineConstants>TRACE</DefineConstants>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="xcopy /Y ${TargetFile} ..\..\..\Games\KSP_win\GameData\VOID\Plugins\" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug_linux|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug</OutputPath>
+    <DefineConstants>DEBUG; TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release_linux|AnyCPU' ">
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Release</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <ConsolePause>false</ConsolePause>
+    <CustomCommands>
+      <CustomCommands>
+        <Command type="AfterBuild" command="cp -afv ${TargetFile} /opt/games/KSP_linux/GameData/${ProjectName}/Plugins/" />
+      </CustomCommands>
+    </CustomCommands>
+  </PropertyGroup>
+  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+  <ItemGroup>
+    <Compile Include="IVOID_Module.cs" />
+    <Compile Include="VOIDFlightMaster.cs" />
+    <Compile Include="VOID_Core.cs" />
+    <Compile Include="VOID_Module.cs" />
+    <Compile Include="VOID_HUD.cs" />
+    <Compile Include="VOID_SaveValue.cs" />
+    <Compile Include="VOID_Orbital.cs" />
+    <Compile Include="VOID_SurfAtmo.cs" />
+    <Compile Include="VOID_VesselInfo.cs" />
+    <Compile Include="VOID_Transfer.cs" />
+    <Compile Include="VOID_CBInfoBrowser.cs" />
+    <Compile Include="VOID_Rendezvous.cs" />
+    <Compile Include="VOID_VesselRegister.cs" />
+    <Compile Include="VOID_DataLogger.cs" />
+    <Compile Include="VOID_EditorCore.cs" />
+    <Compile Include="VOID_EditorHUD.cs" />
+    <Compile Include="VOID_DataValue.cs" />
+    <Compile Include="VOIDEditorMaster.cs" />
+    <Compile Include="VOID_Tools.cs" />
+    <Compile Include="VOID_Localization.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="VOID_HUDAdvanced.cs" />
+  </ItemGroup>
+  <ProjectExtensions>
+    <MonoDevelop>
+      <Properties>
+        <Policies>
+          <TextStylePolicy FileWidth="120" TabsToSpaces="False" EolMarker="Unix" inheritsSet="VisualStudio" inheritsScope="text/plain" scope="text/plain" />
+        </Policies>
+      </Properties>
+    </MonoDevelop>
+  </ProjectExtensions>
+  <ItemGroup>
+    <Reference Include="System">
+      <HintPath>..\_KSPAssemblies\System.dll</HintPath>
+    </Reference>
+    <Reference Include="Assembly-CSharp">
+      <HintPath>..\_KSPAssemblies\Assembly-CSharp.dll</HintPath>
+    </Reference>
+    <Reference Include="UnityEngine">
+      <HintPath>..\_KSPAssemblies\UnityEngine.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\ToadicusTools\ToadicusTools.csproj">
+      <Project>{D48A5542-6655-4149-BC27-B27DF0466F1C}</Project>
+      <Name>ToadicusTools</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\VesselSimulator\VesselSimulator.csproj">
+      <Project>{30FD6C0B-D36E-462F-B0FF-F0FAC9C666CF}</Project>
+      <Name>VesselSimulator</Name>
+    </ProjectReference>
+  </ItemGroup>
+</Project>
 

--- a/VOID_CBInfoBrowser.cs
+++ b/VOID_CBInfoBrowser.cs
@@ -217,13 +217,13 @@
 		    else GUILayout.Label((body.orbit.ApA / 1000).ToString("##,#") + "km", 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(Tools.ConvertInterval(body.orbit.timeToAp), 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));
 
 		    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));
+		    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));
@@ -232,10 +232,10 @@
 		    else GUILayout.Label(body.orbit.eccentricity.ToString("F4") + "", 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(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(Tools.ConvertInterval(body.rotationPeriod), 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));
@@ -274,14 +274,14 @@
 
 			GUILayout.Label((body.Radius / 1000).ToString("##,#") + "km", VOID_Core.Instance.LabelStyles["right"], 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.Label((((body.Radius * body.Radius) * 4 * Math.PI) / 1000).ToString("0.00e+00") + "km²", VOID_Core.Instance.LabelStyles["right"], 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((((4d / 3) * Math.PI * (body.Radius * body.Radius * body.Radius)) / 1000).ToString("0.00e+00") + "km³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
 			GUILayout.Label(body.Mass.ToString("0.00e+00") + "kg", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
-			double p = body.Mass / (Math.Pow(body.Radius, 3) * (4d / 3) * Math.PI);
+			double p = body.Mass / ((body.Radius * body.Radius * body.Radius) * (4d / 3) * Math.PI);
 
 			GUILayout.Label(p.ToString("##,#") + "kg/m³", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
@@ -299,7 +299,7 @@
 
 			GUILayout.Label(num_art_sats.ToString(), VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 
-			double g_ASL = (VOID_Core.Constant_G * body.Mass) / Math.Pow(body.Radius, 2);
+			double g_ASL = (VOID_Core.Constant_G * body.Mass) / (body.Radius * body.Radius);
 
 			GUILayout.Label(Tools.MuMech_ToSI(g_ASL) + "m/s²", VOID_Core.Instance.LabelStyles["right"], GUILayout.ExpandWidth(true));
 

--- a/VOID_Core.cs
+++ b/VOID_Core.cs
@@ -38,6 +38,7 @@
 {
 	public class VOID_Core : VOID_Module, IVOID_Module
 	{
+		#region Singleton Members
 		/*
 		 * Static Members
 		 * */
@@ -72,13 +73,15 @@
 			_instance = null;
 			_initialized = false;
 		}
+		#endregion
 
 		public static double Constant_G = 6.674e-11;
+
 		/*
 		 * Fields
 		 * */
 		protected string VoidName = "VOID";
-		protected string VoidVersion = "0.10.0";
+		protected string VoidVersion = "0.11.0";
 
 		protected bool _factoryReset = false;
 
@@ -136,6 +139,9 @@
 		protected VOID_SaveValue<double> _updatePeriod = 1001f / 15000f;
 		protected float _updateTimer = 0f;
 		protected string stringFrequency;
+
+		[AVOID_SaveValue("vesselSimActive")]
+		protected VOID_SaveValue<bool> vesselSimActive;
 
 		// Vessel Type Housekeeping
 		protected List<VesselType> _allVesselTypes = new List<VesselType>();
@@ -311,7 +317,7 @@
 		{
 			get
 			{
-				return _UseToolbarManager;
+				return _UseToolbarManager & ToolbarManager.ToolbarAvailable;
 			}
 			set
 			{
@@ -472,11 +478,16 @@
 		{
 			this.LoadBeforeUpdate();
 
-			if (this.vessel != null)
-			{
+			if (this.vessel != null && this.vesselSimActive)
+			{
+				double radius = VOID_Core.Instance.vessel.Radius();
 				SimManager.Gravity = VOID_Core.Instance.vessel.mainBody.gravParameter /
-					Math.Pow(VOID_Core.Instance.vessel.Radius(), 2);
+					(radius * radius);
 				SimManager.TryStartSimulation();
+			}
+			else if (!this.vesselSimActive)
+			{
+				SimManager.ClearResults();
 			}
 
 			if (!this.guiRunning)
@@ -622,6 +633,9 @@
 
 			this.UseToolbarManager = GUILayout.Toggle(this.UseToolbarManager, "Use Blizzy's Toolbar If Available");
 
+			this.vesselSimActive.value = GUILayout.Toggle(this.vesselSimActive.value,
+				"Enable Engineering Calculations");
+
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 
 			GUILayout.Label("Skin:", GUILayout.ExpandWidth(false));
@@ -867,6 +881,12 @@
 
 		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);
@@ -982,6 +1002,8 @@
 			this.VOIDIconOffInactivePath = "VOID/Textures/void_icon_light";
 			this.VOIDIconOffActivePath = "VOID/Textures/void_icon_dark";
 
+			this.vesselSimActive = true;
+
 			this.UseToolbarManager = false;
 
 			this.LoadConfig();
@@ -1012,7 +1034,7 @@
 		{
 			get
 			{
-				return core.Kerbin.gravParameter / Math.Pow(core.Kerbin.Radius, 2);
+				return core.Kerbin.gravParameter / (core.Kerbin.Radius * core.Kerbin.Radius);
 			}
 		}
 	}

--- a/VOID_DataLogger.cs
+++ b/VOID_DataLogger.cs
@@ -97,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"))
@@ -234,7 +234,7 @@
 			line += vessel.flightIntegrator.getExternalTemperature().ToString("F2") + ";";
 			//gravity
 			double r_vessel = vessel.mainBody.Radius + vessel.mainBody.GetAltitude(vessel.findWorldCenterOfMass());
-			double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / Math.Pow(r_vessel, 2);
+			double g_vessel = (VOID_Core.Constant_G * vessel.mainBody.Mass) / (r_vessel * r_vessel);
 			line += g_vessel.ToString("F3") + ";";
 			//atm density
 			line += (vessel.atmDensity * 1000).ToString("F3") + ";";

--- a/VOID_DataValue.cs
+++ b/VOID_DataValue.cs
@@ -103,7 +103,7 @@
 			return (T)this.cache;
 		}
 
-		public string ValueUnitString() {
+		public virtual string ValueUnitString() {
 			return this.Value.ToString() + this.Units;
 		}
 
@@ -145,7 +145,6 @@
 		{
 			return v.ToSingle();
 		}
-
 
 		protected IFormatProvider formatProvider;
 
@@ -325,6 +324,26 @@
 	{
 		public VOID_StrValue(string Label, Func<string> ValueFunc) : base(Label, ValueFunc, "") {}
 	}
+
+	public class VOID_Vector3dValue : VOID_DataValue<Vector3d>
+	{
+		public VOID_Vector3dValue(string Label, Func<Vector3d> ValueFunc, string Units)
+			: base(Label, ValueFunc, Units)
+		{}
+
+		public string ToString(string format)
+		{
+			return string.Format("{0}: {1}{2}",
+				this.Label,
+				this.Value.ToString(format),
+				this.Units
+			);
+		}
+
+		public string ValueUnitString(string format) {
+			return this.Value.ToString(format) + this.Units;
+		}
+	}
 }
 
 

--- a/VOID_EditorCore.cs
+++ b/VOID_EditorCore.cs
@@ -129,10 +129,14 @@
 				this.StartGUI();
 			}
 
-			if (EditorLogic.SortedShipList.Count > 0)
+			if (EditorLogic.SortedShipList.Count > 0 && this.vesselSimActive)
 			{
 				SimManager.Gravity = VOID_Data.KerbinGee;
 				SimManager.TryStartSimulation();
+			}
+			else if (!this.vesselSimActive)
+			{
+				SimManager.ClearResults();
 			}
 
 			this.CheckAndSave ();

--- a/VOID_HUD.cs
+++ b/VOID_HUD.cs
@@ -269,62 +269,6 @@
 			() => 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_HUDAdvanced.cs
@@ -1,1 +1,658 @@
-
+// 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 System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using ToadicusTools;
+using UnityEngine;
+
+namespace VOID
+{
+	public class VOID_HUDAdvanced : VOID_Module, IVOID_Module
+	{
+		/*
+		 * Fields
+		 * */
+		protected VOID_HUD primaryHUD;
+
+		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
+		 * */
+		public int ColorIndex
+		{
+			get
+			{
+				if (this.primaryHUD == null)
+				{
+					return 0;
+				}
+
+				return this.primaryHUD.ColorIndex;
+			}
+		}
+
+		/* 
+		 * Methods
+		 * */
+		public VOID_HUDAdvanced() : base()
+		{
+			this._Name = "Advanced Heads-Up Display";
+
+			this._Active.value = true;
+
+			this.leftHUDdefaultPos = new Rect(
+				Screen.width * .5f - (float)GameSettings.UI_SIZE * .25f - 300f,
+				Screen.height - 200f,
+				300f, 90f
+			);
+			this.leftHUDPos = new Rect(this.leftHUDdefaultPos);
+
+			this.rightHUDdefaultPos = new Rect(
+				Screen.width * .5f + (float)GameSettings.UI_SIZE * .25f,
+				Screen.height - 200f,
+				300f, 90f
+			);
+			this.rightHUDPos = new Rect(this.rightHUDdefaultPos);
+
+			this.positionsLocked = true;
+
+			Tools.PostDebugMessage (this, "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(
+					string.Intern("Mass: {0}\n"),
+					VOID_Data.totalMass.ToSIString(2)
+				);
+
+				if (VOID_Data.vesselCrewCapacity > 0)
+				{
+					leftHUD.AppendFormat(
+						string.Intern("Crew: {0} / {1}\n"),
+						VOID_Data.vesselCrewCount.Value,
+						VOID_Data.vesselCrewCapacity.Value
+					);
+				}
+
+				leftHUD.AppendFormat(
+					string.Intern("Acc: {0} T:W: {1}\n"),
+					VOID_Data.vesselAccel.ToSIString(2),
+					VOID_Data.currThrustWeight.Value.ToString("f2")
+				);
+
+				leftHUD.AppendFormat(
+					string.Intern("Ang Vel: {0}\n"),
+					VOID_Data.vesselAngularVelocity.ToSIString(2)
+				);
+
+				if (VOID_Data.stageNominalThrust != 0)
+				{
+					leftHUD.AppendFormat(
+						string.Intern("Thrust Offset: {0}\n"),
+						VOID_Data.vesselThrustOffset.Value.ToString("F1")
+					);
+				}
+			}
+			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(
+					"Burn Δv (Rem/Tot): {0} / {1}\n",
+					VOID_Data.currManeuverDVRemaining.ValueUnitString("f2"),
+					VOID_Data.currManeuverDeltaV.ValueUnitString("f2")
+				);
+
+				if (VOID_Data.upcomingManeuverNodes > 1)
+				{
+					rightHUD.AppendFormat("Next Burn Δv: {0}\n",
+						VOID_Data.nextManeuverDeltaV.ValueUnitString("f2")
+					);
+				}
+
+				rightHUD.AppendFormat("Burn Time (Rem/Total): {0} / {1}\n",
+					VOID_Tools.ConvertInterval(VOID_Data.currentNodeBurnRemaining.Value),
+					VOID_Tools.ConvertInterval(VOID_Data.currentNodeBurnDuration.Value)
+				);
+
+				if (VOID_Data.burnTimeDoneAtNode.Value != string.Empty)
+				{
+					rightHUD.AppendFormat("{0} (done @ node)\n",
+						VOID_Data.burnTimeDoneAtNode.Value
+					);
+
+					rightHUD.AppendFormat("{0} (½ done @ node)",
+						VOID_Data.burnTimeHalfDoneAtNode.Value
+					);
+				}
+				else
+				{
+					rightHUD.Append("Node is past");
+				}
+			}
+			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()
+		{
+			if (this.primaryHUD == null)
+			{
+				foreach (IVOID_Module module in VOID_Core.Instance.Modules)
+				{
+					if (module is VOID_HUD)
+					{
+						this.primaryHUD = module as VOID_HUD;
+					}
+				}
+			}
+			else
+			{
+				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
+				);
+
+				if (VOID_Data.upcomingManeuverNodes > 0)
+				{
+					this.rightHUDPos.value = GUI.Window(
+						VOID_Core.Instance.windowID,
+						this.rightHUDPos,
+						this.rightHUDWindow,
+						GUIContent.none,
+						GUIStyle.none
+					);
+				}
+			}
+		}
+
+		public override void DrawConfigurables()
+		{
+			this.positionsLocked = GUILayout.Toggle(this.positionsLocked,
+				string.Intern("Lock Advanced HUD Positions"),
+				GUILayout.ExpandWidth(false));
+		}
+	}
+
+	public static partial class VOID_Data
+	{
+		public static int upcomingManeuverNodes
+		{
+			get
+			{
+				if (core.vessel == null ||
+					core.vessel.patchedConicSolver == null ||
+					core.vessel.patchedConicSolver.maneuverNodes == null
+				)
+				{
+					return 0;
+				}
+
+				return core.vessel.patchedConicSolver.maneuverNodes.Count;
+			}
+		}
+
+		public static readonly VOID_Vector3dValue vesselThrustOffset = new VOID_Vector3dValue(
+			"Thrust Offset",
+			delegate()
+		{
+			if (core.vessel == null)
+			{
+				return Vector3d.zero;
+			}
+
+			List<PartModule> engineModules = core.vessel.getModulesOfType<PartModule>();
+
+			Vector3d thrustPos = Vector3d.zero;
+			Vector3d thrustDir = Vector3d.zero;
+			float thrust = 0;
+
+			foreach (PartModule engine in engineModules)
+			{
+				float moduleThrust = 0;
+
+				switch (engine.moduleName)
+				{
+					case "ModuleEngines":
+					case "ModuleEnginesFX":
+						break;
+					default:
+						continue;
+				}
+
+				if (!engine.isEnabled)
+				{
+					continue;
+				}
+
+				CenterOfThrustQuery cotQuery = new CenterOfThrustQuery();
+
+				if (engine is ModuleEngines)
+				{
+					ModuleEngines engineModule = engine as ModuleEngines;
+
+					moduleThrust = engineModule.finalThrust;
+
+					engineModule.OnCenterOfThrustQuery(cotQuery);
+				}
+				else // engine is ModuleEnginesFX
+				{
+					ModuleEnginesFX engineFXModule = engine as ModuleEnginesFX;
+
+					moduleThrust = engineFXModule.finalThrust;
+
+					engineFXModule.OnCenterOfThrustQuery(cotQuery);
+				}
+
+				if (moduleThrust != 0d)
+				{
+					cotQuery.thrust = moduleThrust;
+				}
+
+				thrustPos += cotQuery.pos * cotQuery.thrust;
+				thrustDir += cotQuery.dir * cotQuery.thrust;
+				thrust += cotQuery.thrust;
+			}
+
+			if (thrust != 0)
+			{
+				thrustPos /= thrust;
+				thrustDir /= thrust;
+			}
+
+			Vector3d thrustOffset = VectorTools.PointDistanceToLine(
+				thrustPos, thrustDir.normalized, core.vessel.findWorldCenterOfMass());
+
+			Tools.PostDebugMessage(typeof(VOID_Data), "vesselThrustOffset:\n" +
+				"\tthrustPos: {0}\n" +
+				"\tthrustDir: {1}\n" +
+				"\tthrustOffset: {2}\n" +
+				"\tvessel.CoM: {3}",
+				thrustPos,
+				thrustDir.normalized,
+				thrustOffset,
+				core.vessel.findWorldCenterOfMass()
+			);
+
+			return thrustOffset;
+		},
+			"m"
+		);
+
+		public static readonly VOID_DoubleValue vesselAccel = new VOID_DoubleValue(
+			"Acceleration",
+			() => geeForce * KerbinGee,
+			"m/s"
+		);
+
+		public static readonly VOID_IntValue vesselCrewCount = new VOID_IntValue(
+			"Crew Onboard",
+			delegate()
+			{
+				if (core.vessel != null)
+				{
+					return core.vessel.GetCrewCount();
+				}
+				else
+				{
+					return 0;
+				}
+			},
+			""
+		);
+
+		public static readonly VOID_IntValue vesselCrewCapacity = new VOID_IntValue(
+			"Crew Capacity",
+			delegate()
+		{
+			if (core.vessel != null)
+			{
+				return core.vessel.GetCrewCapacity();
+			}
+			else
+			{
+				return 0;
+			}
+		},
+			""
+		);
+
+		public static readonly VOID_DoubleValue vesselAngularVelocity = new VOID_DoubleValue(
+			"Angular Velocity",
+			delegate()
+		{
+			if (core.vessel != null)
+			{
+				return core.vessel.angularVelocity.magnitude;
+			}
+			else
+			{
+				return double.NaN;
+			}
+		},
+			"rad/s"
+		);
+
+		public static readonly VOID_DoubleValue stageNominalThrust = new VOID_DoubleValue(
+			"Nominal Stage Thrust",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			if (SimManager.LastStage.actualThrust == 0d)
+			{
+				return SimManager.LastStage.thrust;
+			}
+			else
+			{
+				return SimManager.LastStage.actualThrust;
+			}
+		},
+			"kN"
+		);
+
+		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 = stageNominalThrust;
+
+			Tools.PostDebugMessage(typeof(VOID_Data), "calculating stageMassFlow from:\n" +
+				"\tstageIsp: {0}\n" +
+				"\tstageThrust: {1}\n" +
+				"\tKerbinGee: {2}\n",
+				stageIsp,
+				stageThrust,
+				KerbinGee
+			);
+
+				return stageThrust / (stageIsp * KerbinGee);
+			},
+			"Mg/s"
+		);
+
+		public static readonly VOID_DoubleValue currManeuverDeltaV = new VOID_DoubleValue(
+			"Current Maneuver Delta-V",
+			delegate()
+			{
+				if (upcomingManeuverNodes > 0)
+				{
+				return core.vessel.patchedConicSolver.maneuverNodes[0].DeltaV.magnitude;
+				}
+				else
+				{
+					return double.NaN;
+				}
+			},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue currManeuverDVRemaining = new VOID_DoubleValue(
+			"Remaining Maneuver Delta-V",
+			delegate()
+			{
+				if (upcomingManeuverNodes > 0)
+				{
+					return core.vessel.patchedConicSolver.maneuverNodes[0].GetBurnVector(core.vessel.orbit).magnitude;
+				}
+				else
+				{
+					return double.NaN;
+				}
+			},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue nextManeuverDeltaV = new VOID_DoubleValue(
+			"Current Maneuver Delta-V",
+			delegate()
+		{
+			if (upcomingManeuverNodes > 1)
+			{
+				return core.vessel.patchedConicSolver.maneuverNodes[1].DeltaV.magnitude;
+			}
+			else
+			{
+				return double.NaN;
+			}
+		},
+			"m/s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeBurnDuration = new VOID_DoubleValue(
+			"Total Burn Time",
+			delegate()
+			{
+				if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+				{
+					return double.NaN;
+				}
+			    
+				double stageThrust = stageNominalThrust;
+
+				return burnTime(currManeuverDeltaV.Value, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeBurnRemaining = new VOID_DoubleValue(
+			"Burn Time Remaining",
+			delegate()
+			{
+				if (SimManager.LastStage == null || currManeuverDVRemaining == double.NaN)
+				{
+					return double.NaN;
+				}
+
+				double stageThrust = stageNominalThrust;
+
+				return burnTime(currManeuverDVRemaining, totalMass, stageMassFlow, stageThrust);
+			},
+			"s"
+		);
+
+		public static readonly VOID_DoubleValue currentNodeHalfBurnDuration = new VOID_DoubleValue(
+			"Half Burn Time",
+			delegate()
+		{
+			if (SimManager.LastStage == null || currManeuverDeltaV.Value == double.NaN)
+			{
+				return double.NaN;
+			}
+
+			double stageThrust = stageNominalThrust;
+
+			return burnTime(currManeuverDeltaV.Value / 2d, totalMass, stageMassFlow, stageThrust);
+		},
+			"s"
+		);
+
+		public static readonly VOID_StrValue burnTimeDoneAtNode = new VOID_StrValue(
+			"Full burn time to be half done at node",
+			delegate()
+		{
+			if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+			{
+				return "N/A";
+			}
+
+			ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+			if ((node.UT - Planetarium.GetUniversalTime()) < 0)
+			{
+				return string.Empty;
+			}
+
+			double interval = (node.UT - currentNodeBurnDuration) - Planetarium.GetUniversalTime();
+
+			int sign = Math.Sign(interval);
+			interval = Math.Abs(interval);
+
+			string format;
+
+			if (sign >= 0)
+			{
+				format = string.Intern("T - {0}");
+			}
+			else
+			{
+				format = string.Intern("T + {0}");
+			}
+
+			return string.Format(format, VOID_Tools.ConvertInterval(interval));
+		}
+		);
+
+		public static readonly VOID_StrValue burnTimeHalfDoneAtNode = new VOID_StrValue(
+			"Full burn time to be half done at node",
+			delegate()
+			{
+			if (SimManager.LastStage == null && upcomingManeuverNodes < 1)
+			{
+				return "N/A";
+			}
+
+			ManeuverNode node = core.vessel.patchedConicSolver.maneuverNodes[0];
+
+			if ((node.UT - Planetarium.GetUniversalTime()) < 0)
+			{
+				return string.Empty;
+			}
+
+			double interval = (node.UT - currentNodeHalfBurnDuration) - Planetarium.GetUniversalTime();
+
+			int sign = Math.Sign(interval);
+			interval = Math.Abs(interval);
+
+			string format;
+
+			if (sign >= 0)
+			{
+				format = string.Intern("T - {0}");
+			}
+			else
+			{
+				format = string.Intern("T + {0}");
+			}
+
+			return string.Format(format, VOID_Tools.ConvertInterval(interval));
+			}
+		);
+
+		private static double burnTime(double deltaV, double initialMass, double massFlow, double thrust)
+		{
+			Tools.PostDebugMessage(typeof(VOID_Data), "calculating burnTime from:\n" +
+				"\tdeltaV: {0}\n" +
+				"\tinitialMass: {1}\n" +
+				"\tmassFlow: {2}\n" +
+				"\tthrust: {3}\n",
+				deltaV,
+				initialMass,
+				massFlow,
+				thrust
+			);
+			return initialMass / massFlow * (Math.Exp(deltaV * massFlow / thrust) - 1d);
+		}
+	}
+}
+

--- a/VOID_Module.cs
+++ b/VOID_Module.cs
@@ -51,6 +51,14 @@
 		/*
 		 * Properties
 		 * */
+		protected virtual VOID_Core core
+		{
+			get
+			{
+				return VOID_Core.Instance;
+			}
+		}
+
 		public virtual bool toggleActive
 		{
 			get

--- a/VOID_Orbital.cs
+++ b/VOID_Orbital.cs
@@ -129,7 +129,14 @@
 	{
 		public static readonly VOID_StrValue primaryName = new VOID_StrValue (
 			VOID_Localization.void_primary,
-			new Func<string> (() => VOID_Core.Instance.vessel.mainBody.name)
+			delegate()
+		{
+			if (VOID_Core.Instance.vessel == null)
+			{
+				return string.Empty;
+			}
+			return VOID_Core.Instance.vessel.mainBody.name;
+		}
 		);
 
 		public static readonly VOID_DoubleValue orbitAltitude = new VOID_DoubleValue (
@@ -158,12 +165,12 @@
 
 		public static readonly VOID_StrValue timeToApo = new VOID_StrValue(
 			"Time to Apoapsis",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToAp))
+			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))
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.timeToPe))
 		);
 
 		public static readonly VOID_DoubleValue orbitInclination = new VOID_DoubleValue(
@@ -179,14 +186,14 @@
 			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) /
-				Math.Pow(orbitRadius, 2);
+				(orbitRadius * orbitRadius);
 		},
 			"m/s²"
 		);
 
 		public static readonly VOID_StrValue orbitPeriod = new VOID_StrValue(
 			"Period",
-			new Func<string>(() => Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
+			new Func<string>(() => VOID_Tools.ConvertInterval(VOID_Core.Instance.vessel.orbit.period))
 		);
 
 		public static readonly VOID_DoubleValue semiMajorAxis = new VOID_DoubleValue(
@@ -233,7 +240,7 @@
 
 		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)),
 			"°"
 		);

--- a/VOID_Rendezvous.cs
+++ b/VOID_Rendezvous.cs
@@ -58,7 +58,10 @@
 			Vessel rendezvessel = new Vessel();
 			CelestialBody rendezbody = new CelestialBody();
 
-			this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+			if (this.RegisterModule == null)
+			{
+				this.RegisterModule = VOID_Core.Instance.Modules.Where(m => typeof(VOID_VesselRegister).IsAssignableFrom(m.GetType())).FirstOrDefault() as VOID_VesselRegister;
+			}
 
 			GUILayout.BeginVertical();
 
@@ -148,7 +151,7 @@
 					// Toadicus edit: added local sidereal longitude.
 					// Toadicus edit: added local sidereal longitude.
 					double LSL = v.longitude + v.orbit.referenceBody.rotationAngle;
-					LSL = Tools.FixDegreeDomain (LSL);
+					LSL = VOID_Tools.FixDegreeDomain (LSL);
 
 					//display orbital info for orbiting/flying/suborbital/escaping vessels only
 					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
@@ -190,13 +193,19 @@
 					GUILayout.Label(Tools.MuMech_ToSI((vessel.findWorldCenterOfMass() - v.findWorldCenterOfMass()).magnitude) + "m", GUILayout.ExpandWidth(false));
 					GUILayout.EndHorizontal();
 
-					//target_vessel_extended_orbital_info = GUILayout.Toggle(target_vessel_extended_orbital_info, "Extended info");
+					// Toadicus edit: added local sidereal longitude.
+					GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
+					GUILayout.Label("Local Sidereal Longitude:");
+					GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
+					GUILayout.EndHorizontal();
+
+					toggleExtendedOrbital.value = GUILayout.Toggle(toggleExtendedOrbital, "Extended info");
 
 					if (toggleExtendedOrbital)
 					{
 						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));
@@ -235,24 +244,18 @@
 						GUILayout.Label("Arg. of periapsis:");
 						GUILayout.Label(v.orbit.argumentOfPeriapsis.ToString("F3") + "°", GUILayout.ExpandWidth(false));
 						GUILayout.EndHorizontal();
-
-						// Toadicus edit: added local sidereal longitude.
-						GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
-						GUILayout.Label("Local Sidereal Longitude:");
-						GUILayout.Label(LSL.ToString("F3") + "°", VOID_Core.Instance.LabelStyles["right"]);
-						GUILayout.EndHorizontal();
 					}
 				}
 				else
 				{
 					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));
@@ -297,28 +300,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_SurfAtmo.cs
+++ b/VOID_SurfAtmo.cs
@@ -125,12 +125,12 @@
 
 		public static readonly VOID_StrValue surfLatitude = new VOID_StrValue(
 			"Latitude",
-			new Func<string> (() => Tools.GetLatitudeString(VOID_Core.Instance.vessel))
+			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))
+			new Func<string> (() => VOID_Tools.GetLongitudeString(VOID_Core.Instance.vessel))
 		);
 
 		public static readonly VOID_StrValue vesselHeading = new VOID_StrValue(
@@ -138,7 +138,7 @@
 			delegate()
 		{
 			double heading = core.vessel.getSurfaceHeading();
-			string cardinal = Tools.get_heading_text(heading);
+			string cardinal = VOID_Tools.get_heading_text(heading);
 
 			return string.Format(
 				"{0}° {1}",
@@ -198,7 +198,7 @@
 
 		public static readonly VOID_StrValue currBiome = new VOID_StrValue(
 			"Biome",
-			new Func<string> (() => Tools.GetBiome(VOID_Core.Instance.vessel).name)
+			new Func<string> (() => VOID_Tools.GetBiome(VOID_Core.Instance.vessel).name)
 		);
 
 	}

--- a/VOID_Tools.cs
+++ b/VOID_Tools.cs
@@ -30,9 +30,9 @@
 using System;
 using UnityEngine;
 
-namespace ToadicusTools
+namespace VOID
 {
-	public static partial class Tools
+	public static partial class VOID_Tools
 	{
 		#region VESSEL_EXTENSIONS_SCIENCE
 		public static CBAttributeMap.MapAttribute GetBiome(this Vessel vessel)
@@ -111,6 +111,11 @@
 
 		public static ExperimentSituations GetExperimentSituation(this Vessel vessel)
 		{
+			if (vessel == null)
+			{
+				return ExperimentSituations.SrfSplashed;
+			}
+
 			Vessel.Situations situation = vessel.situation;
 
 			switch (situation)
@@ -251,54 +256,79 @@
 		}
 		#endregion
 
+		/// <summary>
+		/// Converts the interval given in seconds to a human-friendly
+		/// time period in [years], [days], hours, minutes, and seconds.
+		/// 
+		/// Uses sidereal days, since "6 hours per day" is the Kerbal standard.
+		/// </summary>
+		/// <returns>Human readable interval</returns>
+		/// <param name="seconds"></param>
 		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;
+			double SecondsPerMinute = 60d;
+			double SecondsPerHour = 3600d;
+			double SecondsPerDay;
+			double SecondsPerYear;
+
+			if (GameSettings.KERBIN_TIME)
+			{
+				SecondsPerDay = 21600d;
+				SecondsPerYear = 9203545d;
+			}
+			else
+			{
+				SecondsPerDay = 86164.1d;
+				SecondsPerYear = 31558149d;
+			}
+
+			int years;
+			int days;
+			int hours;
+			int minutes;
+
+			years = (int)(seconds / SecondsPerYear);
+
+			seconds %= SecondsPerYear;
+
+			days = (int)(seconds / SecondsPerDay);
+
+			seconds %= SecondsPerDay;
+
+			hours = (int)(seconds / SecondsPerHour);
+
+			seconds %= SecondsPerHour;
+
+			minutes = (int)(seconds / SecondsPerMinute);
+
+			seconds %= SecondsPerMinute;
+
+			string format_1 = string.Intern("{0:D1}y {1:D1}d {2:D2}h {3:D2}m {4:00.0}s");
+			string format_2 = string.Intern("{0:D1}d {1:D2}h {2:D2}m {3:00.0}s");
+			string format_3 = string.Intern("{0:D2}h {1:D2}m {2:00.0}s");
+			string format_4 = string.Intern("{0:D2}m {1:00.0}s");
+			string format_5 = string.Intern("{0:00.0}s");
+
 			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));
+				return string.Format(format_1, years, days, hours, minutes, seconds);
+			}
+			else if (days > 0)
+			{
+				return string.Format(format_2, days, hours, minutes, seconds);
+			}
+			else if (hours > 0)
+			{
+				return string.Format(format_3, hours, minutes, seconds);
+			}
+			else if (minutes > 0)
+			{
+				return string.Format(format_4, minutes, seconds);
 			}
 			else
 			{
-				output = string.Format(format_3,
-					interval.Hours,
-					interval.Minutes,
-					interval.Seconds,
-					interval.Milliseconds.ToString().Substring(0, 1));
-			}
-			return output;
+				return string.Format(format_5, seconds);
+			}
 		}
 
 		public static string UppercaseFirst(string s)
@@ -315,8 +345,14 @@
 		//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));
+			r_target /= 1000;
+			r_current /= 1000;
+			grav_param /= 1000000000;
+
+			double midpoint = (r_target + r_current) / 2;
+
+			double T_target = (2 * Math.PI) * Math.Sqrt((r_target * r_target * r_target) / grav_param);
+			double T_transfer = (2 * Math.PI) * Math.Sqrt((midpoint * midpoint * midpoint) / grav_param);
 			return 360 * (0.5 - (T_transfer / (2 * T_target)));
 		}
 
@@ -355,7 +391,7 @@
             r = r1*r2
             return math.sqrt(bar / r)
             */
-			double foo = r2 * Math.Pow(v, 2) - 2 * mu;
+			double foo = r2 * (v * v) - 2 * mu;
 			double bar = r1 * foo + (2 * r2 * mu);
 			double r = r1 * r2;
 			return Math.Sqrt(bar / r);
@@ -377,9 +413,9 @@
             return 180 - degrees
             */
 			double epsilon, h, ee, theta, degrees;
-			epsilon = (Math.Pow(v, 2) / 2) - (mu / r);
+			epsilon = ((v * v) / 2) - (mu / r);
 			h = r * v * Math.Sin(angle);
-			ee = Math.Sqrt(1 + ((2 * epsilon * Math.Pow(h, 2)) / Math.Pow(mu, 2)));
+			ee = Math.Sqrt(1 + ((2 * epsilon * (h * h)) / (mu * mu)));
 			theta = Math.Acos(1.0 / ee);
 			degrees = theta * (180.0 / Math.PI);
 			return 180 - degrees;
@@ -511,7 +547,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Phase angle (curr/trans):");
 			GUILayout.Label(
-				Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + Tools.Nivvy_CalcTransferPhaseAngle(
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 					vessel.orbit.semiMajorAxis,
 					body.orbit.semiMajorAxis,
 					vessel.mainBody.gravParameter
@@ -523,7 +559,7 @@
 			GUILayout.BeginHorizontal(GUILayout.ExpandWidth(true));
 			GUILayout.Label("Transfer velocity:");
 			GUILayout.Label(
-				(Tools.Younata_DeltaVToGetToOtherBody(
+				(VOID_Tools.Younata_DeltaVToGetToOtherBody(
 					(vessel.mainBody.gravParameter / 1000000000),
 					(vessel.orbit.semiMajorAxis / 1000),
 					(body.orbit.semiMajorAxis / 1000)
@@ -535,46 +571,46 @@
 
 		public static void display_transfer_angles_PLANET2PLANET(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
 				(vessel.mainBody.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
+			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 = Tools.Younata_TransferBurnPoint(
+			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 = Tools.Adammada_CurrentEjectionAngle(
+			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 = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 				vessel.mainBody.orbit.semiMajorAxis,
 				body.orbit.semiMajorAxis,
 				vessel.mainBody.referenceBody.gravParameter
 			) % 360;
-			double curr_phase_angle = Tools.Adammada_CurrrentPhaseAngle(
+			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 = 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);
+			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):");
@@ -600,13 +636,13 @@
 
 		public static void display_transfer_angles_PLANET2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.gravParameter / 1000000000),
 				(vessel.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
 
-			double trans_phase_angle = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_Tools.Nivvy_CalcTransferPhaseAngle(
 				vessel.orbit.semiMajorAxis,
 				body.orbit.semiMajorAxis,
 				vessel.mainBody.gravParameter
@@ -615,7 +651,7 @@
 			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") + "°",
+				VOID_Tools.mrenigma03_calcphase(vessel, body).ToString("F3") + "° / " + trans_phase_angle.ToString("F3") + "°",
 				GUILayout.ExpandWidth(false)
 			);
 			GUILayout.EndHorizontal();
@@ -628,50 +664,50 @@
 
 		public static void display_transfer_angles_MOON2MOON(CelestialBody body, Vessel vessel)
 		{
-			double dv1 = Tools.Younata_DeltaVToGetToOtherBody(
+			double dv1 = VOID_Tools.Younata_DeltaVToGetToOtherBody(
 				(vessel.mainBody.referenceBody.gravParameter / 1000000000),
 				(vessel.mainBody.orbit.semiMajorAxis / 1000),
 				(body.orbit.semiMajorAxis / 1000)
 			);
-			double dv2 = Tools.Younata_DeltaVToExitSOI(
+			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 = Tools.Younata_TransferBurnPoint(
+			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 = Tools.Adammada_CurrrentPhaseAngle(
+			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 = Tools.Adammada_CurrentEjectionAngle(
+			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 = Tools.Nivvy_CalcTransferPhaseAngle(
+			double trans_phase_angle = VOID_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_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 = Tools.adjust_transfer_ejection_angle(trans_ejection_angle, trans_phase_angle);
-			double adj_curr_ejection_angle = Tools.adjust_current_ejection_angle(curr_ejection_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);
 			//
 			//
 

--- a/VOID_Transfer.cs
+++ b/VOID_Transfer.cs
@@ -68,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
 					}
 			    }
@@ -91,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
 			            }
 			        }
@@ -110,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
 			        }
 			    }
@@ -133,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
@@ -26,12 +26,13 @@
 // 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 Engineer.Extensions;
 using KSP;
 using System;
 using System.Collections.Generic;
+using ToadicusTools;
 using UnityEngine;
-using Engineer.VesselSimulator;
-using Engineer.Extensions;
 
 namespace VOID
 {
@@ -107,7 +108,7 @@
 			"Total Mass",
 			delegate()
 		{
-			if (SimManager.LastStage == null)
+			if (SimManager.Stages == null || SimManager.LastStage == null)
 			{
 				return double.NaN;
 			}
@@ -121,12 +122,12 @@
 			"Resource Mass",
 			delegate()
 			{
-				double rscMass = 0;
-				foreach (Part part in VOID_Core.Instance.vessel.Parts)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 				{
-					rscMass += part.GetResourceMass();
+					return double.NaN;
 				}
-				return rscMass;
+
+				return SimManager.LastStage.totalBaseMass;
 			},
 			"tons"
 		);
@@ -135,11 +136,9 @@
 			"DeltaV (Current Stage)",
 			delegate()
 			{
-				if (SimManager.Stages == null ||
-					SimManager.Stages.Length <= Staging.lastStage
-				)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return double.NaN;
-				return SimManager.Stages[Staging.lastStage].deltaV;
+				return SimManager.LastStage.deltaV;
 			},
 			"m/s"
 		);
@@ -148,7 +147,7 @@
 			"DeltaV (Total)",
 			delegate()
 			{
-				if (SimManager.Stages == null)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return double.NaN;
 				return SimManager.LastStage.totalDeltaV;
 			},
@@ -165,7 +164,7 @@
 			"Thrust (curr/max)",
 			delegate()
 			{
-				if (SimManager.Stages == null)
+				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return "N/A";
 
 				double currThrust = SimManager.LastStage.actualThrust;
@@ -179,6 +178,34 @@
 			}
 		);
 
+		public static readonly VOID_DoubleValue currThrustWeight = new VOID_DoubleValue(
+			"T:W Ratio",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			return SimManager.LastStage.actualThrustToWeight;
+		},
+			""
+		);
+
+		public static readonly VOID_DoubleValue maxThrustWeight = new VOID_DoubleValue(
+			"T:W Ratio",
+			delegate()
+		{
+			if (SimManager.LastStage == null)
+			{
+				return double.NaN;
+			}
+
+			return SimManager.LastStage.maxThrustToWeight;
+		},
+			""
+		);
+
 		public static readonly VOID_StrValue currmaxThrustWeight = new VOID_StrValue(
 			"T:W (curr/max)",
 			delegate()
@@ -186,20 +213,10 @@
 				if (SimManager.Stages == null || SimManager.LastStage == null)
 					return "N/A";
 
-				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
-					);
-				double weight = mass * gravity;
-
 				return string.Format(
 					"{0} / {1}",
-					(currThrust / weight).ToString("F2"),
-					(maxThrust / weight).ToString("F2")
+					(VOID_Data.currThrustWeight.Value).ToString("F2"),
+					(VOID_Data.maxThrustWeight.Value).ToString("F2")
 				);
 			}
 		);
@@ -214,7 +231,7 @@
 				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);
+				(VOID_Core.Instance.vessel.mainBody.Radius * VOID_Core.Instance.vessel.mainBody.Radius);
 				double weight = mass * gravity;
 
 				return maxThrust / weight;
@@ -236,15 +253,17 @@
 				{
 					if (part.enabled)
 					{
+						ModuleEngines engineModule;
+						ModuleEnginesFX enginesFXModule;
 						List<Propellant> propellantList = null;
 
-						if (part.HasModule<ModuleEngines>())
+						if (part.tryGetFirstModuleOfType<ModuleEngines>(out engineModule))
 						{
-							propellantList = part.GetModule<ModuleEngines>().propellants;
+							propellantList = engineModule.propellants;
 						}
-						else if (part.HasModule<ModuleEnginesFX>())
+						else if (part.tryGetFirstModuleOfType<ModuleEnginesFX>(out enginesFXModule))
 						{
-							propellantList = part.GetModule<ModuleEnginesFX>().propellants;
+							propellantList = enginesFXModule.propellants;
 						}
 							
 						if (propellantList != null)
@@ -260,10 +279,10 @@
 						}
 					}
 
-					if (part.HasModule<ModuleResourceIntake>() && part.enabled)
+					ModuleResourceIntake intakeModule;
+
+					if (part.enabled && part.tryGetFirstModuleOfType<ModuleResourceIntake>(out intakeModule))
 					{
-						ModuleResourceIntake intakeModule = part.GetModule<ModuleResourceIntake>();
-
 						if (intakeModule.resourceName == "IntakeAir")
 						{
 							currentAmount += intakeModule.airFlow;

--- a/VOID_VesselRegister.cs
+++ b/VOID_VesselRegister.cs
@@ -115,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();

--- a/Wrapper/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,37 +1,1 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
 
-// Allgemeine Informationen über eine Assembly werden über die folgenden 
-// Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-// die mit einer Assembly verknüpft sind.
-[assembly: AssemblyTitle("Toolbar Wrapper for Kerbal Space Program")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("ToolbarWrapper")]
-[assembly: AssemblyCopyright("Copyright © 2013-2014 Maik Schreiber")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Durch Festlegen von ComVisible auf "false" werden die Typen in dieser Assembly unsichtbar 
-// für COM-Komponenten. Wenn Sie auf einen Typ in dieser Assembly von 
-// COM zugreifen müssen, legen Sie das ComVisible-Attribut für diesen Typ auf "true" fest.
-[assembly: ComVisible(false)]
-
-// Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird
-[assembly: Guid("bfd95a60-6335-4a59-a29e-438d806d8f2d")]
-
-// Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-//
-//      Hauptversion
-//      Nebenversion 
-//      Buildnummer
-//      Revision
-//
-// Sie können alle Werte angeben oder die standardmäßigen Build- und Revisionsnummern 
-// übernehmen, indem Sie "*" eingeben:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
-

--- a/Wrapper/ToolbarWrapper.cs
+++ /dev/null
@@ -1,793 +1,1 @@
-/*
-Copyright (c) 2013-2014, Maik Schreiber
-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.
-
-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 System.Text;
-using UnityEngine;
-
-
-namespace VOID {
-
-
-
-	/**********************************************************\
-	*          --- DO NOT EDIT BELOW THIS COMMENT ---          *
-	*                                                          *
-	* This file contains classes and interfaces to use the     *
-	* Toolbar Plugin without creating a hard dependency on it. *
-	*                                                          *
-	* There is nothing in this file that needs to be edited    *
-	* by hand.                                                 *
-	*                                                          *
-	*          --- DO NOT EDIT BELOW THIS COMMENT ---          *
-	\**********************************************************/
-
-
-
-	/// <summary>
-	/// The global tool bar manager.
-	/// </summary>
-	public partial class ToolbarManager : IToolbarManager {
-		/// <summary>
-		/// Whether the Toolbar Plugin is available.
-		/// </summary>
-		public static bool ToolbarAvailable {
-			get {
-				if (toolbarAvailable == null) {
-					toolbarAvailable = Instance != null;
-				}
-				return (bool) toolbarAvailable;
-			}
-		}
-
-		/// <summary>
-		/// The global tool bar manager instance.
-		/// </summary>
-		public static IToolbarManager Instance {
-			get {
-				if ((toolbarAvailable != false) && (instance_ == null)) {
-					Type type = ToolbarTypes.getType("Toolbar.ToolbarManager");
-					if (type != null) {
-						object realToolbarManager = ToolbarTypes.getStaticProperty(type, "Instance").GetValue(null, null);
-						instance_ = new ToolbarManager(realToolbarManager);
-					}
-				}
-				return instance_;
-			}
-		}
-	}
-
-	#region interfaces
-
-	/// <summary>
-	/// A toolbar manager.
-	/// </summary>
-	public interface IToolbarManager {
-		/// <summary>
-		/// Adds a new button.
-		/// </summary>
-		/// <remarks>
-		/// To replace an existing button, just add a new button using the old button's namespace and ID.
-		/// Note that the new button will inherit the screen position of the old button.
-		/// </remarks>
-		/// <param name="ns">The new button's namespace. This is usually the plugin's name. Must not include special characters like '.'</param>
-		/// <param name="id">The new button's ID. This ID must be unique across all buttons in the namespace. Must not include special characters like '.'</param>
-		/// <returns>The button created.</returns>
-		IButton add(string ns, string id);
-	}
-
-	/// <summary>
-	/// Represents a clickable button.
-	/// </summary>
-	public interface IButton {
-		/// <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"/>
-		string Text {
-			set;
-			get;
-		}
-
-		/// <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>
-		Color TextColor {
-			set;
-			get;
-		}
-
-		/// <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"/>
-		string TexturePath {
-			set;
-			get;
-		}
-
-		/// <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>
-		string ToolTip {
-			set;
-			get;
-		}
-
-		/// <summary>
-		/// Whether this button is currently visible or not. Can be used in addition to or as a replacement for <see cref="Visibility"/>.
-		/// </summary>
-		/// <remarks>
-		/// Setting this property to true does not affect the player's ability to hide the button using the configuration.
-		/// Conversely, setting this property to false does not enable the player to show the button using the configuration.
-		/// </remarks>
-		bool Visible {
-			set;
-			get;
-		}
-
-		/// <summary>
-		/// Determines this button's visibility. Can be used in addition to or as a replacement for <see cref="Visible"/>.
-		/// </summary>
-		/// <remarks>
-		/// The return value from IVisibility.Visible is subject to the same rules as outlined for
-		/// <see cref="Visible"/>.
-		/// </remarks>
-		IVisibility Visibility {
-			set;
-			get;
-		}
-
-		/// <summary>
-		/// Whether this button is currently effectively visible or not. This is a combination of
-		/// <see cref="Visible"/> and <see cref="Visibility"/>.
-		/// </summary>
-		/// <remarks>
-		/// Note that the toolbar is not visible in certain game scenes, for example the loading screens. This property
-		/// does not reflect button invisibility in those scenes. In addition, this property does not reflect the
-		/// player's configuration of the button's visibility.
-		/// </remarks>
-		bool EffectivelyVisible {
-			get;
-		}
-
-		/// <summary>
-		/// Whether this button is currently enabled (clickable) or not. This does not affect the player's ability to
-		/// position the button on their toolbar.
-		/// </summary>
-		bool Enabled {
-			set;
-			get;
-		}
-
-		/// <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 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>
-		/// Setting this property to true does not affect the player's ability to hide the button using the
-		/// configuration.
-		/// </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>
-		bool Important {
-			set;
-			get;
-		}
-
-		/// <summary>
-		/// A drawable that is tied to the current button. This can be anything from a popup menu to
-		/// an informational window. Set to null to hide the drawable.
-		/// </summary>
-		IDrawable Drawable {
-			set;
-			get;
-		}
-
-		/// <summary>
-		/// Event handler that can be registered with to receive "on click" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// IButton button = ...
-		/// button.OnClick += (e) => {
-		///     Debug.Log("button clicked, mouseButton: " + e.MouseButton);
-		/// };
-		/// </code>
-		/// </example>
-		event ClickHandler OnClick;
-
-		/// <summary>
-		/// Event handler that can be registered with to receive "on mouse enter" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// IButton button = ...
-		/// button.OnMouseEnter += (e) => {
-		///     Debug.Log("mouse entered button");
-		/// };
-		/// </code>
-		/// </example>
-		event MouseEnterHandler OnMouseEnter;
-
-		/// <summary>
-		/// Event handler that can be registered with to receive "on mouse leave" events.
-		/// </summary>
-		/// <example>
-		/// <code>
-		/// IButton button = ...
-		/// button.OnMouseLeave += (e) => {
-		///     Debug.Log("mouse left button");
-		/// };
-		/// </code>
-		/// </example>
-		event MouseLeaveHandler OnMouseLeave;
-
-		/// <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>
-		void Destroy();
-	}
-
-	/// <summary>
-	/// A drawable that is tied to a particular button. This can be anything from a popup menu
-	/// to an informational window.
-	/// </summary>
-	public interface IDrawable {
-		/// <summary>
-		/// Update any information. This is called once per frame.
-		/// </summary>
-		void Update();
-
-		/// <summary>
-		/// Draws GUI widgets for this drawable. This is the equivalent to the OnGUI() message in
-		/// <see cref="MonoBehaviour"/>.
-		/// </summary>
-		/// <remarks>
-		/// The drawable will be positioned near its parent toolbar according to the drawable's current
-		/// width/height.
-		/// </remarks>
-		/// <param name="position">The left/top position of where to draw this drawable.</param>
-		/// <returns>The current width/height of this drawable.</returns>
-		Vector2 Draw(Vector2 position);
-	}
-
-	#endregion
-
-	#region events
-
-	/// <summary>
-	/// Event describing a click on a button.
-	/// </summary>
-	public partial class ClickEvent : EventArgs {
-		/// <summary>
-		/// The button that has been clicked.
-		/// </summary>
-		public readonly IButton Button;
-
-		/// <summary>
-		/// The mouse button which the button was clicked with.
-		/// </summary>
-		/// <remarks>
-		/// Is 0 for left mouse button, 1 for right mouse button, and 2 for middle mouse button.
-		/// </remarks>
-		public readonly int MouseButton;
-	}
-
-	/// <summary>
-	/// An event handler that is invoked whenever a button has been clicked.
-	/// </summary>
-	/// <param name="e">An event describing the button click.</param>
-	public delegate void ClickHandler(ClickEvent e);
-
-	/// <summary>
-	/// Event describing the mouse pointer moving about a button.
-	/// </summary>
-	public abstract partial class MouseMoveEvent {
-		/// <summary>
-		/// The button in question.
-		/// </summary>
-		public readonly IButton button;
-	}
-
-	/// <summary>
-	/// Event describing the mouse pointer entering a button's area.
-	/// </summary>
-	public partial class MouseEnterEvent : MouseMoveEvent {
-	}
-
-	/// <summary>
-	/// Event describing the mouse pointer leaving a button's area.
-	/// </summary>
-	public partial class MouseLeaveEvent : MouseMoveEvent {
-	}
-
-	/// <summary>
-	/// An event handler that is invoked whenever the mouse pointer enters a button's area.
-	/// </summary>
-	/// <param name="e">An event describing the mouse pointer entering.</param>
-	public delegate void MouseEnterHandler(MouseEnterEvent e);
-
-	/// <summary>
-	/// An event handler that is invoked whenever the mouse pointer leaves a button's area.
-	/// </summary>
-	/// <param name="e">An event describing the mouse pointer leaving.</param>
-	public delegate void MouseLeaveHandler(MouseLeaveEvent e);
-
-	#endregion
-
-	#region visibility
-
-	/// <summary>
-	/// Determines visibility of a button.
-	/// </summary>
-	/// <seealso cref="IButton.Visibility"/>
-	public interface IVisibility {
-		/// <summary>
-		/// Whether a button is currently visible or not.
-		/// </summary>
-		/// <seealso cref="IButton.Visible"/>
-		bool Visible {
-			get;
-		}
-	}
-
-	/// <summary>
-	/// Determines visibility of a button in relation to the currently running game scene.
-	/// </summary>
-	/// <example>
-	/// <code>
-	/// IButton button = ...
-	/// button.Visibility = new GameScenesVisibility(GameScenes.EDITOR, GameScenes.SPH);
-	/// </code>
-	/// </example>
-	/// <seealso cref="IButton.Visibility"/>
-	public class GameScenesVisibility : IVisibility {
-		private GameScenes[] gameScenes;
-
-		public bool Visible {
-			get {
-				return (bool) visibleProperty.GetValue(realGameScenesVisibility, null);
-			}
-		}
-
-		private object realGameScenesVisibility;
-		private PropertyInfo visibleProperty;
-
-		public GameScenesVisibility(params GameScenes[] gameScenes) {
-			Type gameScenesVisibilityType = ToolbarTypes.getType("Toolbar.GameScenesVisibility");
-			realGameScenesVisibility = Activator.CreateInstance(gameScenesVisibilityType, new object[] { gameScenes });
-			visibleProperty = ToolbarTypes.getProperty(gameScenesVisibilityType, "Visible");
-			this.gameScenes = gameScenes;
-		}
-	}
-
-	#endregion
-
-	#region drawable
-
-	/// <summary>
-	/// A drawable that draws a popup menu.
-	/// </summary>
-	public partial class PopupMenuDrawable : IDrawable {
-		/// <summary>
-		/// Event handler that can be registered with to receive "any menu option clicked" events.
-		/// </summary>
-		public event Action OnAnyOptionClicked {
-			add {
-				onAnyOptionClickedEvent.AddEventHandler(realPopupMenuDrawable, value);
-			}
-			remove {
-				onAnyOptionClickedEvent.RemoveEventHandler(realPopupMenuDrawable, value);
-			}
-		}
-
-		private object realPopupMenuDrawable;
-		private MethodInfo updateMethod;
-		private MethodInfo drawMethod;
-		private MethodInfo addOptionMethod;
-		private MethodInfo addSeparatorMethod;
-		private MethodInfo destroyMethod;
-		private EventInfo onAnyOptionClickedEvent;
-
-		public PopupMenuDrawable() {
-			Type popupMenuDrawableType = ToolbarTypes.getType("Toolbar.PopupMenuDrawable");
-			realPopupMenuDrawable = Activator.CreateInstance(popupMenuDrawableType, null);
-			updateMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Update");
-			drawMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Draw");
-			addOptionMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "AddOption");
-			addSeparatorMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "AddSeparator");
-			destroyMethod = ToolbarTypes.getMethod(popupMenuDrawableType, "Destroy");
-			onAnyOptionClickedEvent = ToolbarTypes.getEvent(popupMenuDrawableType, "OnAnyOptionClicked");
-		}
-
-		public void Update() {
-			updateMethod.Invoke(realPopupMenuDrawable, null);
-		}
-
-		public Vector2 Draw(Vector2 position) {
-			return (Vector2) drawMethod.Invoke(realPopupMenuDrawable, new object[] { position });
-		}
-
-		/// <summary>
-		/// Adds a new option to the popup menu.
-		/// </summary>
-		/// <param name="text">The text of the option.</param>
-		/// <returns>A button that can be used to register clicks on the menu option.</returns>
-		public IButton AddOption(string text) {
-			object realButton = addOptionMethod.Invoke(realPopupMenuDrawable, new object[] { text });
-			return new Button(realButton, new ToolbarTypes());
-		}
-
-		/// <summary>
-		/// Adds a separator to the popup menu.
-		/// </summary>
-		public void AddSeparator() {
-			addSeparatorMethod.Invoke(realPopupMenuDrawable, null);
-		}
-
-		/// <summary>
-		/// Destroys this drawable. This must always be called before disposing of this drawable.
-		/// </summary>
-		public void Destroy() {
-			destroyMethod.Invoke(realPopupMenuDrawable, null);
-		}
-	}
-
-	#endregion
-
-	#region private implementations
-
-	public partial class ToolbarManager : IToolbarManager {
-		private static bool? toolbarAvailable = null;
-		private static IToolbarManager instance_;
-
-		private object realToolbarManager;
-		private MethodInfo addMethod;
-		private Dictionary<object, IButton> buttons = new Dictionary<object, IButton>();
-		private ToolbarTypes types = new ToolbarTypes();
-
-		private ToolbarManager(object realToolbarManager) {
-			this.realToolbarManager = realToolbarManager;
-
-			addMethod = ToolbarTypes.getMethod(types.iToolbarManagerType, "add");
-		}
-
-		public IButton add(string ns, string id) {
-			object realButton = addMethod.Invoke(realToolbarManager, new object[] { ns, id });
-			IButton button = new Button(realButton, types);
-			buttons.Add(realButton, button);
-			return button;
-		}
-	}
-
-	internal class Button : IButton {
-		private object realButton;
-		private ToolbarTypes types;
-		private Delegate realClickHandler;
-		private Delegate realMouseEnterHandler;
-		private Delegate realMouseLeaveHandler;
-
-		internal Button(object realButton, ToolbarTypes types) {
-			this.realButton = realButton;
-			this.types = types;
-
-			realClickHandler = attachEventHandler(types.button.onClickEvent, "clicked", realButton);
-			realMouseEnterHandler = attachEventHandler(types.button.onMouseEnterEvent, "mouseEntered", realButton);
-			realMouseLeaveHandler = attachEventHandler(types.button.onMouseLeaveEvent, "mouseLeft", realButton);
-		}
-
-		private Delegate attachEventHandler(EventInfo @event, string methodName, object realButton) {
-			MethodInfo method = GetType().GetMethod(methodName, BindingFlags.NonPublic | BindingFlags.Instance);
-			Delegate d = Delegate.CreateDelegate(@event.EventHandlerType, this, method);
-			@event.AddEventHandler(realButton, d);
-			return d;
-		}
-
-		public string Text {
-			set {
-				types.button.textProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (string) types.button.textProperty.GetValue(realButton, null);
-			}
-		}
-
-		public Color TextColor {
-			set {
-				types.button.textColorProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (Color) types.button.textColorProperty.GetValue(realButton, null);
-			}
-		}
-
-		public string TexturePath {
-			set {
-				types.button.texturePathProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (string) types.button.texturePathProperty.GetValue(realButton, null);
-			}
-		}
-
-		public string ToolTip {
-			set {
-				types.button.toolTipProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (string) types.button.toolTipProperty.GetValue(realButton, null);
-			}
-		}
-
-		public bool Visible {
-			set {
-				types.button.visibleProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (bool) types.button.visibleProperty.GetValue(realButton, null);
-			}
-		}
-
-		public IVisibility Visibility {
-			set {
-				object functionVisibility = null;
-				if (value != null) {
-					functionVisibility = Activator.CreateInstance(types.functionVisibilityType, new object[] { new Func<bool>(() => value.Visible) });
-				}
-				types.button.visibilityProperty.SetValue(realButton, functionVisibility, null);
-				visibility_ = value;
-			}
-			get {
-				return visibility_;
-			}
-		}
-		private IVisibility visibility_;
-
-		public bool EffectivelyVisible {
-			get {
-				return (bool) types.button.effectivelyVisibleProperty.GetValue(realButton, null);
-			}
-		}
-
-		public bool Enabled {
-			set {
-				types.button.enabledProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (bool) types.button.enabledProperty.GetValue(realButton, null);
-			}
-		}
-
-		public bool Important {
-			set {
-				types.button.importantProperty.SetValue(realButton, value, null);
-			}
-			get {
-				return (bool) types.button.importantProperty.GetValue(realButton, null);
-			}
-		}
-
-		public IDrawable Drawable {
-			set {
-				object functionDrawable = null;
-				if (value != null) {
-					functionDrawable = Activator.CreateInstance(types.functionDrawableType, new object[] {
-						new Action(() => value.Update()),
-						new Func<Vector2, Vector2>((pos) => value.Draw(pos))
-					});
-				}
-				types.button.drawableProperty.SetValue(realButton, functionDrawable, null);
-				drawable_ = value;
-			}
-			get {
-				return drawable_;
-			}
-		}
-		private IDrawable drawable_;
-
-		public event ClickHandler OnClick;
-
-		private void clicked(object realEvent) {
-			if (OnClick != null) {
-				OnClick(new ClickEvent(realEvent, this));
-			}
-		}
-
-		public event MouseEnterHandler OnMouseEnter;
-
-		private void mouseEntered(object realEvent) {
-			if (OnMouseEnter != null) {
-				OnMouseEnter(new MouseEnterEvent(this));
-			}
-		}
-
-		public event MouseLeaveHandler OnMouseLeave;
-
-		private void mouseLeft(object realEvent) {
-			if (OnMouseLeave != null) {
-				OnMouseLeave(new MouseLeaveEvent(this));
-			}
-		}
-
-		public void Destroy() {
-			detachEventHandler(types.button.onClickEvent, realClickHandler, realButton);
-			detachEventHandler(types.button.onMouseEnterEvent, realMouseEnterHandler, realButton);
-			detachEventHandler(types.button.onMouseLeaveEvent, realMouseLeaveHandler, realButton);
-
-			types.button.destroyMethod.Invoke(realButton, null);
-		}
-
-		private void detachEventHandler(EventInfo @event, Delegate d, object realButton) {
-			@event.RemoveEventHandler(realButton, d);
-		}
-	}
-
-	public partial class ClickEvent : EventArgs {
-		internal ClickEvent(object realEvent, IButton button) {
-			Type type = realEvent.GetType();
-			Button = button;
-			MouseButton = (int) type.GetField("MouseButton", BindingFlags.Public | BindingFlags.Instance).GetValue(realEvent);
-		}
-	}
-
-	public abstract partial class MouseMoveEvent : EventArgs {
-		internal MouseMoveEvent(IButton button) {
-			this.button = button;
-		}
-	}
-
-	public partial class MouseEnterEvent : MouseMoveEvent {
-		internal MouseEnterEvent(IButton button)
-			: base(button) {
-		}
-	}
-
-	public partial class MouseLeaveEvent : MouseMoveEvent {
-		internal MouseLeaveEvent(IButton button)
-			: base(button) {
-		}
-	}
-
-	internal class ToolbarTypes {
-		internal readonly Type iToolbarManagerType;
-		internal readonly Type functionVisibilityType;
-		internal readonly Type functionDrawableType;
-		internal readonly ButtonTypes button;
-
-		internal ToolbarTypes() {
-			iToolbarManagerType = getType("Toolbar.IToolbarManager");
-			functionVisibilityType = getType("Toolbar.FunctionVisibility");
-			functionDrawableType = getType("Toolbar.FunctionDrawable");
-
-			Type iButtonType = getType("Toolbar.IButton");
-			button = new ButtonTypes(iButtonType);
-		}
-
-		internal static Type getType(string name) {
-			return AssemblyLoader.loadedAssemblies
-				.SelectMany(a => a.assembly.GetExportedTypes())
-				.SingleOrDefault(t => t.FullName == name);
-		}
-
-		internal static PropertyInfo getProperty(Type type, string name) {
-			return type.GetProperty(name, BindingFlags.Public | BindingFlags.Instance);
-		}
-
-		internal static PropertyInfo getStaticProperty(Type type, string name) {
-			return type.GetProperty(name, BindingFlags.Public | BindingFlags.Static);
-		}
-
-		internal static EventInfo getEvent(Type type, string name) {
-			return type.GetEvent(name, BindingFlags.Public | BindingFlags.Instance);
-		}
-
-		internal static MethodInfo getMethod(Type type, string name) {
-			return type.GetMethod(name, BindingFlags.Public | BindingFlags.Instance);
-		}
-	}
-
-	internal class ButtonTypes {
-		internal readonly Type iButtonType;
-		internal readonly PropertyInfo textProperty;
-		internal readonly PropertyInfo textColorProperty;
-		internal readonly PropertyInfo texturePathProperty;
-		internal readonly PropertyInfo toolTipProperty;
-		internal readonly PropertyInfo visibleProperty;
-		internal readonly PropertyInfo visibilityProperty;
-		internal readonly PropertyInfo effectivelyVisibleProperty;
-		internal readonly PropertyInfo enabledProperty;
-		internal readonly PropertyInfo importantProperty;
-		internal readonly PropertyInfo drawableProperty;
-		internal readonly EventInfo onClickEvent;
-		internal readonly EventInfo onMouseEnterEvent;
-		internal readonly EventInfo onMouseLeaveEvent;
-		internal readonly MethodInfo destroyMethod;
-
-		internal ButtonTypes(Type iButtonType) {
-			this.iButtonType = iButtonType;
-
-			textProperty = ToolbarTypes.getProperty(iButtonType, "Text");
-			textColorProperty = ToolbarTypes.getProperty(iButtonType, "TextColor");
-			texturePathProperty = ToolbarTypes.getProperty(iButtonType, "TexturePath");
-			toolTipProperty = ToolbarTypes.getProperty(iButtonType, "ToolTip");
-			visibleProperty = ToolbarTypes.getProperty(iButtonType, "Visible");
-			visibilityProperty = ToolbarTypes.getProperty(iButtonType, "Visibility");
-			effectivelyVisibleProperty = ToolbarTypes.getProperty(iButtonType, "EffectivelyVisible");
-			enabledProperty = ToolbarTypes.getProperty(iButtonType, "Enabled");
-			importantProperty = ToolbarTypes.getProperty(iButtonType, "Important");
-			drawableProperty = ToolbarTypes.getProperty(iButtonType, "Drawable");
-			onClickEvent = ToolbarTypes.getEvent(iButtonType, "OnClick");
-			onMouseEnterEvent = ToolbarTypes.getEvent(iButtonType, "OnMouseEnter");
-			onMouseLeaveEvent = ToolbarTypes.getEvent(iButtonType, "OnMouseLeave");
-			destroyMethod = ToolbarTypes.getMethod(iButtonType, "Destroy");
-		}
-	}
-
-	#endregion
-}
-

file:a/Wrapper/Wrapper.csproj (deleted)
--- a/Wrapper/Wrapper.csproj
+++ /dev/null
@@ -1,59 +1,1 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E258AB2C-E2BB-4ACA-B902-C98582041F69}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>ToolbarWrapper</RootNamespace>
-    <AssemblyName>ToolbarWrapper</AssemblyName>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="Assembly-CSharp">
-      <HintPath>..\..\..\..\Programme\KSP_23_dev\KSP_Data\Managed\Assembly-CSharp.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-    <Reference Include="UnityEngine">
-      <HintPath>..\..\..\..\Programme\KSP_23_dev\KSP_Data\Managed\UnityEngine.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="ToolbarWrapper.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+