Updated the copyright year.
Updated the copyright year.

--- a/ARFlightController.cs
+++ b/ARFlightController.cs
@@ -2,7 +2,7 @@
 //
 // ARFlightController.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -41,8 +41,6 @@
 		protected Dictionary<ConnectionStatus, string> connectionTextures;
 		protected Dictionary<ConnectionStatus, Texture> appLauncherTextures;
 
-		protected ARMapRenderer mapRenderer;
-
 		protected IButton toolbarButton;
 
 		protected ApplicationLauncherButton appLauncherButton;
@@ -144,11 +142,6 @@
 
 			GameEvents.onGameSceneLoadRequested.Add(this.onSceneChangeRequested);
 			GameEvents.onVesselChange.Add(this.onVesselChange);
-		}
-
-		protected void Start()
-		{
-			this.mapRenderer = MapView.MapCamera.gameObject.AddComponent<ARMapRenderer>();
 		}
 
 		protected void FixedUpdate()
@@ -209,7 +202,7 @@
 				// ...unlock the controls.
 				InputLockManager.RemoveControlLock(this.lockID);
 			}
-				
+
 			if (
 				(this.toolbarButton != null || this.appLauncherButton != null) &&
 				HighLogic.LoadedSceneIsFlight &&
@@ -304,11 +297,6 @@
 		{
 			InputLockManager.RemoveControlLock(this.lockID);
 
-			if (this.mapRenderer != null)
-			{
-				GameObject.Destroy(this.mapRenderer);
-			}
-
 			if (this.toolbarButton != null)
 			{
 				this.toolbarButton.Destroy();

file:a/ARMapRenderer.cs (deleted)
--- a/ARMapRenderer.cs
+++ /dev/null
@@ -1,277 +1,1 @@
-// AntennaRange
-//
-// ARMapRenderer.cs
-//
-// Copyright © 2014, toadicus
-// All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without modification,
-// are permitted provided that the following conditions are met:
-//
-// 1. Redistributions of source code must retain the above copyright notice,
-//    this list of conditions and the following disclaimer.
-//
-// 2. Redistributions in binary form must reproduce the above copyright notice,
-//    this list of conditions and the following disclaimer in the documentation and/or other
-//    materials provided with the distribution.
-//
-// 3. Neither the name of the copyright holder nor the names of its contributors may be used
-//    to endorse or promote products derived from this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
-// INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-// WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-using KSP;
-using System;
-using System.Collections.Generic;
-using ToadicusTools;
-using UnityEngine;
-
-namespace AntennaRange
-{
-	public class ARMapRenderer : MonoBehaviour
-	{
-		#region Fields
-		private Dictionary<Guid, LineRenderer> vesselLineRenderers;
-		private Dictionary<Guid, bool> vesselFrameCache;
-		#endregion
-
-		#region Properties
-		public LineRenderer this[Guid idx]
-		{
-			get
-			{
-				if (this.vesselLineRenderers == null)
-				{
-					this.vesselLineRenderers = new Dictionary<Guid, LineRenderer>();
-				}
-
-				if (!this.vesselLineRenderers.ContainsKey(idx))
-				{
-					GameObject obj = new GameObject();
-					obj.layer = 31;
-
-					LineRenderer lr = obj.AddComponent<LineRenderer>();
-
-					lr.SetColors(Color.green, Color.green);
-					lr.material = new Material(Shader.Find("Particles/Additive"));
-					lr.SetVertexCount(2);
-
-					this.vesselLineRenderers[idx] = lr;
-				}
-
-				return this.vesselLineRenderers[idx];
-			}
-		}
-		#endregion
-
-		#region MonoBehaviour Lifecycle
-		private void Awake()
-		{
-			this.vesselLineRenderers = new Dictionary<Guid, LineRenderer>();
-			this.vesselFrameCache = new Dictionary<Guid, bool>();
-		}
-
-		private void OnPreCull()
-		{
-			if (!HighLogic.LoadedSceneIsFlight || !MapView.MapIsEnabled)
-			{
-				this.Cleanup();
-
-				return;
-			}
-
-			Tools.DebugLogger log = Tools.DebugLogger.New(this);
-
-			try
-			{
-				log.AppendFormat("OnPreCull.\n");
-
-				log.AppendFormat("\tMapView: Draw3DLines: {0}\n" +
-					"\tMapView.MapCamera.camera.fieldOfView: {1}\n" +
-					"\tMapView.MapCamera.Distance: {2}\n",
-					MapView.Draw3DLines,
-					MapView.MapCamera.camera.fieldOfView,
-					MapView.MapCamera.Distance
-				);
-
-				this.vesselFrameCache.Clear();
-
-				log.AppendLine("vesselFrameCache cleared.");
-
-				if (FlightGlobals.ready && FlightGlobals.Vessels != null)
-				{
-					log.AppendLine("FlightGlobals ready and Vessels list not null.");
-
-					foreach (Vessel vessel in FlightGlobals.Vessels)
-					{
-						if (vessel == null)
-						{
-							log.AppendFormat("Skipping vessel {0} altogether because it is null.\n");
-							continue;
-						}
-
-						log.AppendFormat("Checking vessel {0}.\n", vessel.vesselName);
-
-						switch (vessel.vesselType)
-						{
-							case VesselType.Debris:
-							case VesselType.EVA:
-							case VesselType.Unknown:
-							case VesselType.SpaceObject:
-								log.AppendFormat("\tDiscarded because vessel is of invalid type {0}\n",
-									vessel.vesselType);
-								continue;
-						}
-
-						log.Append("\tChecking connection status...\n");
-
-						if (vessel.HasConnectedRelay())
-						{
-							log.AppendLine("\tHas a connection, checking for the best relay to use for the line.");
-
-							IAntennaRelay vesselRelay = null;
-							float bestScore = float.PositiveInfinity;
-							float relayScore = float.NaN;
-
-							foreach (IAntennaRelay relay in RelayDatabase.Instance[vessel].Values)
-							{
-								relayScore = (float)relay.transmitDistance / relay.maxTransmitDistance;
-
-								if (relayScore < bestScore)
-								{
-									bestScore = relayScore;
-									vesselRelay = relay as IAntennaRelay;
-								}
-							}
-
-							if (vesselRelay != null)
-							{
-								log.AppendFormat("\t...picked relay {0} with a score of {1}", 
-									vesselRelay, relayScore
-								);
-
-								this.SetRelayVertices(vesselRelay);
-							}
-						}
-						else if (this.vesselLineRenderers.ContainsKey(vessel.id))
-						{
-							log.AppendLine("\tDisabling line because vessel has no connection.");
-							this[vessel.id].enabled = false;
-						}
-					}
-				}
-			}
-			finally
-			{
-				log.Print();
-			}
-		}
-
-		private void OnDestroy()
-		{
-			this.Cleanup();
-
-			print("ARMapRenderer: Destroyed.");
-		}
-		#endregion
-
-		private void SetRelayVertices(IAntennaRelay relay)
-		{
-			do
-			{
-				if (this.vesselFrameCache.ContainsKey(relay.vessel.id))
-				{
-					break;
-				}
-
-				LineRenderer renderer = this[relay.vessel.id];
-
-				Vector3d start;
-				Vector3d end;
-
-				renderer.enabled = true;
-
-				if (relay.transmitDistance < relay.nominalTransmitDistance)
-				{
-					renderer.SetColors(Color.green, Color.green);
-				}
-				else
-				{
-					renderer.SetColors(Color.yellow, Color.yellow);
-				}
-
-				start = ScaledSpace.LocalToScaledSpace(relay.vessel.GetWorldPos3D());
-
-				if (relay.KerbinDirect)
-				{
-					if (relay.firstOccludingBody != null && relay.bestOccludedRelay != null)
-					{
-						end = ScaledSpace.LocalToScaledSpace(relay.bestOccludedRelay.vessel.GetWorldPos3D());
-					}
-					else
-					{
-						end = ScaledSpace.LocalToScaledSpace(AntennaRelay.Kerbin.position);
-					}
-				}
-				else
-				{
-					end = ScaledSpace.LocalToScaledSpace(relay.nearestRelay.vessel.GetWorldPos3D());
-				}
-
-				float lineWidth;
-
-				if (MapView.Draw3DLines)
-				{
-					lineWidth = 0.004f * MapView.MapCamera.Distance;
-				}
-				else
-				{
-					lineWidth = 1f;
-
-					start = MapView.MapCamera.camera.WorldToScreenPoint(start);
-					end = MapView.MapCamera.camera.WorldToScreenPoint(end);
-
-					float d = Screen.height / 2f + 0.01f;
-					start.z = start.z >= 0f ? d : -d;
-					end.z = end.z >= 0f ? d : -d;
-				}
-
-				renderer.SetWidth(lineWidth, lineWidth);
-
-				renderer.SetPosition(0, start);
-				renderer.SetPosition(1, end);
-
-				this.vesselFrameCache[relay.vessel.id] = true;
-
-				relay = relay.nearestRelay;
-			}
-			while (relay != null);
-		}
-
-		public void Cleanup()
-		{
-			if (this.vesselLineRenderers != null && this.vesselLineRenderers.Count > 0)
-			{
-				foreach (LineRenderer lineRenderer in this.vesselLineRenderers.Values)
-				{
-					lineRenderer.enabled = false;
-					GameObject.Destroy(lineRenderer.gameObject);
-				}
-				this.vesselLineRenderers.Clear();
-			}
-
-			if (this.vesselFrameCache != null && this.vesselFrameCache.Count > 0)
-			{
-				this.vesselFrameCache.Clear();
-			}
-		}
-	}
-}
-
-

--- a/AntennaRange.csproj
+++ b/AntennaRange.csproj
@@ -78,7 +78,6 @@
     <Compile Include="RelayExtensions.cs" />
     <Compile Include="ARConfiguration.cs" />
     <Compile Include="ARFlightController.cs" />
-    <Compile Include="ARMapRenderer.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>

--- a/AntennaRelay.cs
+++ b/AntennaRelay.cs
@@ -2,7 +2,7 @@
 //
 // AntennaRelay.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -31,30 +31,14 @@
 using System.Linq;
 using ToadicusTools;
 
-// @DONE TODO: Retool nearestRelay to always contain the nearest relay, even if out of range.
-// @DONE TODO: Retool CanTransmit to not rely on nearestRelay == null.
-// TODO: Track occluded vessels somehow.
-
 namespace AntennaRange
 {
 	public class AntennaRelay
 	{
 		// We don't have a Bard, so we'll hide Kerbin here.
-		private static CelestialBody _Kerbin;
-		public static CelestialBody Kerbin
-		{
-			get
-			{
-				if (_Kerbin == null && FlightGlobals.ready)
-				{
-					_Kerbin = FlightGlobals.GetHomeBody();
-				}
-
-				return _Kerbin;
-			}
-		}
-
-		private IAntennaRelay _nearestRelayCache;
+		protected CelestialBody Kerbin;
+
+		protected IAntennaRelay _nearestRelayCache;
 		protected IAntennaRelay moduleRef;
 
 		protected System.Diagnostics.Stopwatch searchTimer;
@@ -80,11 +64,10 @@
 		{
 			get
 			{
-				if (!this.searchTimer.IsRunning ||
+				if (this.searchTimer.IsRunning &&
 					this.searchTimer.ElapsedMilliseconds > this.millisecondsBetweenSearches)
 				{
 					this._nearestRelayCache = this.FindNearestRelay();
-
 					this.searchTimer.Restart();
 				}
 
@@ -96,88 +79,61 @@
 			}
 		}
 
-		public IAntennaRelay bestOccludedRelay
+		/// <summary>
+		/// Gets the first <see cref="CelestialBody"/> found to be blocking line of sight.
+		/// </summary>
+		public virtual CelestialBody firstOccludingBody
 		{
 			get;
 			protected set;
 		}
 
 		/// <summary>
-		/// Gets the first <see cref="CelestialBody"/> found to be blocking line of sight.
-		/// </summary>
-		public virtual CelestialBody firstOccludingBody
+		/// Gets the transmit distance.
+		/// </summary>
+		/// <value>The transmit distance.</value>
+		public double transmitDistance
+		{
+			get
+			{
+				this.nearestRelay = this.FindNearestRelay();
+
+				// If there is no available relay nearby...
+				if (this.nearestRelay == null)
+				{
+					// .. return the distance to Kerbin
+					return this.DistanceTo(this.Kerbin);
+				}
+				else
+				{
+					/// ...otherwise, return the distance to the nearest available relay.
+					return this.DistanceTo(nearestRelay);
+				}
+			}
+		}
+
+		/// <summary>
+		/// The maximum distance at which this relay can operate.
+		/// </summary>
+		/// <value>The max transmit distance.</value>
+		public virtual float maxTransmitDistance
+		{
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether this <see cref="AntennaRange.ProtoDataTransmitter"/> has been checked during
+		/// the current relay attempt.
+		/// </summary>
+		/// <value><c>true</c> if relay checked; otherwise, <c>false</c>.</value>
+		public virtual bool relayChecked
 		{
 			get;
 			protected set;
 		}
 
 		/// <summary>
-		/// Gets the transmit distance.
-		/// </summary>
-		/// <value>The transmit distance.</value>
-		public double transmitDistance
-		{
-			get
-			{
-				// If there is no available relay nearby...
-				// @DONE TODO: Remove nearestRelay == null
-				double kerbinDistance = this.DistanceTo(Kerbin);
-
-				if (this.nearestRelay != null)
-				{
-					double relayDistance = this.DistanceTo(this.nearestRelay);
-
-					// If our nearest relay is nearer than Kerbin, use its distance.
-					if (relayDistance < kerbinDistance)
-					{
-						this.KerbinDirect = false;
-
-						return relayDistance;
-					}
-				}
-
-				this.KerbinDirect = true;
-				
-
-				// .. return the distance to Kerbin
-				return kerbinDistance;
-			}
-		}
-
-		public virtual double nominalTransmitDistance
-		{
-			get;
-			set;
-		}
-
-		/// <summary>
-		/// The maximum distance at which this relay can operate.
-		/// </summary>
-		/// <value>The max transmit distance.</value>
-		public virtual float maxTransmitDistance
-		{
-			get;
-			set;
-		}
-
-		/// <summary>
-		/// Gets a value indicating whether this <see cref="AntennaRange.ProtoDataTransmitter"/> has been checked during
-		/// the current relay attempt.
-		/// </summary>
-		/// <value><c>true</c> if relay checked; otherwise, <c>false</c>.</value>
-		public virtual bool relayChecked
-		{
-			get;
-			protected set;
-		}
-
-		public virtual bool KerbinDirect
-		{
-			get;
-			protected set;
-		}
-
-		/// <summary>
 		/// Determines whether this instance can transmit.
 		/// </summary>
 		/// <returns><c>true</c> if this instance can transmit; otherwise, <c>false</c>.</returns>
@@ -185,30 +141,20 @@
 		{
 			CelestialBody fob = null;
 
-			// @DONE TODO: Remove nearestRelay == null
-			// Because we're correctly falling back to Kerbin in transmitDistance the first test should always fail
-			// when we're out of range of anything, and the second will fail when LOS is blocked (and enforced).
-
-			// If our transmit distance is greater than our maximum range, we can't transmit and it doesn't matter why.
-			if (this.transmitDistance > this.maxTransmitDistance)
-			{
-				this.firstOccludingBody = null;
+			if (
+				this.transmitDistance > this.maxTransmitDistance ||
+				(
+					ARConfiguration.RequireLineOfSight &&
+					this.nearestRelay == null &&
+					!this.vessel.hasLineOfSightTo(this.Kerbin, out fob, ARConfiguration.RadiusRatio)
+				)
+			)
+			{
+				this.firstOccludingBody = fob;
 				return false;
 			}
-			// ...if we're in range...
 			else
 			{
-				// ...check for LOS problems...
-				if (
-					ARConfiguration.RequireLineOfSight
-					&& this.KerbinDirect &&
-					!this.vessel.hasLineOfSightTo(Kerbin, out fob, ARConfiguration.RadiusRatio)
-				)
-				{
-					this.firstOccludingBody = fob;
-					return false;
-				}
-
 				this.firstOccludingBody = null;
 				return true;
 			}
@@ -218,9 +164,9 @@
 		/// Finds the nearest relay.
 		/// </summary>
 		/// <returns>The nearest relay or null, if no relays in range.</returns>
-		private IAntennaRelay FindNearestRelay()
-		{
-			/*if (this.searchTimer.IsRunning && this.searchTimer.ElapsedMilliseconds < this.millisecondsBetweenSearches)
+		public IAntennaRelay FindNearestRelay()
+		{
+			if (this.searchTimer.IsRunning && this.searchTimer.ElapsedMilliseconds < this.millisecondsBetweenSearches)
 			{
 				return this.nearestRelay;
 			}
@@ -231,7 +177,7 @@
 				this.searchTimer.Reset();
 			}
 
-			this.searchTimer.Start();*/
+			this.searchTimer.Start();
 
 			Tools.PostDebugMessage(string.Format(
 				"{0}: finding nearest relay for {1} ({2})",
@@ -241,14 +187,11 @@
 			));
 
 			this.firstOccludingBody = null;
-			this.bestOccludedRelay = null;
 
 			// Set this vessel as checked, so that we don't check it again.
 			RelayDatabase.Instance.CheckedVesselsTable[vessel.id] = true;
 
 			double nearestSqrDistance = double.PositiveInfinity;
-			double bestOccludedSqrDistance = double.PositiveInfinity;
-
 			IAntennaRelay _nearestRelay = null;
 
 			/*
@@ -284,16 +227,11 @@
 					continue;
 				}
 
-				// Find the distance from here to the vessel...
-				double potentialSqrDistance = this.sqrDistanceTo(potentialVessel);
-
 				// Skip vessels to which we do not have line of sight.
 				CelestialBody fob = null;
 
-				if (
-					ARConfiguration.RequireLineOfSight &&
-					!this.vessel.hasLineOfSightTo(potentialVessel, out fob, ARConfiguration.RadiusRatio)
-				)
+				if (ARConfiguration.RequireLineOfSight &&
+					!this.vessel.hasLineOfSightTo(potentialVessel, out fob, ARConfiguration.RadiusRatio))
 				{
 					this.firstOccludingBody = fob;
 					Tools.PostDebugMessage(
@@ -301,31 +239,25 @@
 						"Vessel {0} discarded because we do not have line of sight.",
 						potentialVessel.vesselName
 					);
-
-					if (
-						potentialSqrDistance < bestOccludedSqrDistance &&
-						potentialSqrDistance < this.maxTransmitDistance
+					continue;
+				}
+
+				this.firstOccludingBody = null;
+
+				// Find the distance from here to the vessel...
+				double potentialSqrDistance = (potentialVessel.GetWorldPos3D() - vessel.GetWorldPos3D()).sqrMagnitude;
+
+				/*
+				 * ...so that we can skip the vessel if it is further away than Kerbin, our transmit distance, or a
+				 * vessel we've already checked.
+				 * */
+				if (
+					potentialSqrDistance > Tools.Min(
+						this.maxTransmitDistance * this.maxTransmitDistance,
+						nearestSqrDistance,
+						this.vessel.sqrDistanceTo(Kerbin)
 					)
-					{
-						foreach (IAntennaRelay occludedRelay in potentialVessel.GetAntennaRelays())
-						{
-							if (occludedRelay.CanTransmit())
-							{
-								this.bestOccludedRelay = occludedRelay;
-								this.firstOccludingBody = fob;
-								bestOccludedSqrDistance = potentialSqrDistance;
-								break;
-							}
-						}
-					}
-
-					continue;
-				}
-
-				/*
-				 * ...so that we can skip the vessel if it is further away than a vessel we've already checked.
-				 * */
-				if (potentialSqrDistance > nearestSqrDistance)
+				)
 				{
 					Tools.PostDebugMessage(
 						this,
@@ -370,6 +302,10 @@
 
 			this.searchTimer = new System.Diagnostics.Stopwatch();
 			this.millisecondsBetweenSearches = 5000;
+
+			// HACK: This might not be safe in all circumstances, but since AntennaRelays are not built until Start,
+			// we hope it is safe enough.
+			this.Kerbin = FlightGlobals.Bodies.FirstOrDefault(b => b.name == "Kerbin");
 		}
 	}
 }

--- a/GameData/AntennaRange/AntennaRange.cfg
+++ b/GameData/AntennaRange/AntennaRange.cfg
@@ -2,7 +2,7 @@
 //
 // AntennaRange.cfg
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,

--- a/IAntennaRelay.cs
+++ b/IAntennaRelay.cs
@@ -2,7 +2,7 @@
 //
 // IAntennaRelay.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -42,15 +42,11 @@
 		/// <value>The parent Vessel.</value>
 		Vessel vessel { get; }
 
-		IAntennaRelay nearestRelay { get; }
-
 		/// <summary>
 		/// Gets the distance to the nearest relay or Kerbin, whichever is closer.
 		/// </summary>
 		/// <value>The distance to the nearest relay or Kerbin, whichever is closer.</value>
 		double transmitDistance { get; }
-
-		double nominalTransmitDistance { get; }
 
 		/// <summary>
 		/// The maximum distance at which this relay can operate.
@@ -72,12 +68,6 @@
 		bool relayChecked { get; }
 
 		/// <summary>
-		/// Gets a value indicating whether this <see cref="AntennaRange.IAntennaRelay"/> Relay is communicating
-		/// directly with Kerbin.
-		/// </summary>
-		bool KerbinDirect { get; }
-
-		/// <summary>
 		/// Determines whether this instance can transmit.
 		/// </summary>
 		/// <returns><c>true</c> if this instance can transmit; otherwise, <c>false</c>.</returns>

--- a/ModuleLimitedDataTransmitter.cs
+++ b/ModuleLimitedDataTransmitter.cs
@@ -2,7 +2,7 @@
 //
 // ModuleLimitedDataTransmitter.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -74,11 +74,8 @@
 		[KSPField(isPersistant = false)]
 		public float nominalRange;
 
-		[KSPField(isPersistant = false, guiActive = true, guiName = "Status")]
+		[KSPField(isPersistant = false, guiActive = true, guiName = "Relay")]
 		public string UIrelayStatus;
-
-		[KSPField(isPersistant = false, guiActive = true, guiName = "Relay")]
-		public string UIrelayTarget;
 
 		[KSPField(isPersistant = false, guiActive = true, guiName = "Transmission Distance")]
 		public string UItransmitDistance;
@@ -125,33 +122,12 @@
 			}
 		}
 
-		public IAntennaRelay nearestRelay
-		{
-			get
-			{
-				if (this.relay == null)
-				{
-					return null;
-				}
-
-				return this.relay.nearestRelay;
-			}
-		}
-
 		// Returns the distance to the nearest relay or Kerbin, whichever is closer.
 		public double transmitDistance
 		{
 			get
 			{
 				return this.relay.transmitDistance;
-			}
-		}
-
-		public double nominalTransmitDistance
-		{
-			get
-			{
-				return this.nominalRange;
 			}
 		}
 
@@ -241,26 +217,7 @@
 		{
 			get
 			{
-				if (this.relay != null)
-				{
-					return this.relay.relayChecked;
-				}
-
-				// If our relay is null, always return null so we're never checked.
-				return true;
-			}
-		}
-
-		public bool KerbinDirect
-		{
-			get
-			{
-				if (this.relay != null)
-				{
-					return this.relay.KerbinDirect;
-				}
-
-				return false;
+				return this.relay.relayChecked;
 			}
 		}
 
@@ -306,7 +263,6 @@
 			{
 				this.relay = new AntennaRelay(this);
 				this.relay.maxTransmitDistance = this.maxTransmitDistance;
-				this.relay.nominalTransmitDistance = this.nominalRange;
 
 				this.UImaxTransmitDistance = Tools.MuMech_ToSI(this.maxTransmitDistance) + "m";
 
@@ -449,9 +405,7 @@
 
 				message.Append("Beginning transmission ");
 
-				// @DONE TODO: Fix this to fall back to Kerbin if nearestRelay cannot be contacted.
-				// @DONE TODO: Remove nearestRelay == null
-				if (this.KerbinDirect)
+				if (this.relay.nearestRelay == null)
 				{
 					message.Append("directly to Kerbin.");
 				}
@@ -569,9 +523,7 @@
 
 				message.Append("Beginning transmission ");
 
-				// @DONE TODO: Fix this to fall back to Kerbin if nearestRelay cannot be contacted.
-				// @DONE TODO: Remove nearestRelay == null
-				if (this.KerbinDirect)
+				if (this.relay.nearestRelay == null)
 				{
 					message.Append("directly to Kerbin.");
 				}
@@ -597,7 +549,7 @@
 			{
 				if (this.CanTransmit())
 				{
-					this.UIrelayStatus = "Connected";
+					this.UIrelayStatus = string.Intern("Connected");
 					this.UItransmitDistance = Tools.MuMech_ToSI(this.transmitDistance) + "m";
 					this.UIpacketSize = Tools.MuMech_ToSI(this.DataRate) + "MiT";
 					this.UIpacketCost = Tools.MuMech_ToSI(this.DataResourceCost) + "E";
@@ -606,7 +558,7 @@
 				{
 					if (this.relay.firstOccludingBody == null)
 					{
-						this.UIrelayStatus = "Out of range";
+						this.UIrelayStatus = string.Intern("Out of range");
 					}
 					else
 					{
@@ -615,22 +567,6 @@
 					this.UImaxTransmitDistance = "N/A";
 					this.UIpacketSize = "N/A";
 					this.UIpacketCost = "N/A";
-				}
-
-				if (this.KerbinDirect)
-				{
-					if (this.relay.bestOccludedRelay != null)
-					{
-						this.UIrelayTarget = this.relay.bestOccludedRelay.ToString();
-					}
-					else
-					{
-						this.UIrelayTarget = "Kerbin";
-					}
-				}
-				else
-				{
-					this.UIrelayTarget = this.relay.nearestRelay.ToString();
 				}
 			}
 		}

--- a/Properties/AssemblyInfo.cs
+++ b/Properties/AssemblyInfo.cs
@@ -2,7 +2,7 @@
 //
 // AssemblyInfo.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,

--- a/ProtoAntennaRelay.cs
+++ b/ProtoAntennaRelay.cs
@@ -2,7 +2,7 @@
 //
 // ProtoAntennaRelay.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -47,14 +47,6 @@
 			get
 			{
 				return this.protoPart.pVesselRef.vesselRef;
-			}
-		}
-
-		public override double nominalTransmitDistance
-		{
-			get
-			{
-				return this.moduleRef.nominalTransmitDistance;
 			}
 		}
 
@@ -113,7 +105,7 @@
 		public override string ToString()
 		{
 			return string.Format(
-				"{0} on {1}",
+				"{0} on {1} (proto)",
 				this.title,
 				this.protoPart.pVesselRef.vesselName
 			);

--- a/RelayDatabase.cs
+++ b/RelayDatabase.cs
@@ -2,7 +2,7 @@
 //
 // RelayDatabase.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -35,27 +35,8 @@
 
 namespace AntennaRange
 {
-	public class RelayDatabase
+	public class RelayDatabase : Singleton<RelayDatabase>
 	{
-		/*
-		 * Static members
-		 * */
-		// Singleton storage
-		protected static RelayDatabase _instance;
-		// Gets the singleton
-		public static RelayDatabase Instance
-		{
-			get
-			{	
-				if (_instance == null)
-				{
-					_instance = new RelayDatabase();
-				}
-
-				return _instance;
-			}
-		}
-
 		/*
 		 * Instance members
 		 * */

--- a/RelayExtensions.cs
+++ b/RelayExtensions.cs
@@ -2,7 +2,7 @@
 //
 // Extensions.cs
 //
-// Copyright © 2014, toadicus
+// Copyright © 2014-2015, toadicus
 // All rights reserved.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -68,21 +68,6 @@
 			return relayOne.DistanceTo(relayTwo.vessel);
 		}
 
-		public static double sqrDistanceTo(this AntennaRelay relay, Vessel vessel)
-		{
-			return relay.vessel.sqrDistanceTo(vessel);
-		}
-
-		public static double sqrDistanceTo(this AntennaRelay relay, CelestialBody body)
-		{
-			return relay.vessel.sqrDistanceTo(body);
-		}
-
-		public static double sqrDistanceTo(this AntennaRelay relayOne, AntennaRelay relayTwo)
-		{
-			return relayOne.vessel.sqrDistanceTo(relayTwo.vessel);
-		}
-
 		/// <summary>
 		/// Returns all of the PartModules or ProtoPartModuleSnapshots implementing IAntennaRelay in this Vessel.
 		/// </summary>