diff --git a/SourceCode/GPS/Forms/Field/FormBndTool.cs b/SourceCode/GPS/Forms/Field/FormBndTool.cs
index 50ad4c7dd..02b5d4137 100644
--- a/SourceCode/GPS/Forms/Field/FormBndTool.cs
+++ b/SourceCode/GPS/Forms/Field/FormBndTool.cs
@@ -565,7 +565,11 @@ private void cboxIsZoom_CheckedChanged(object sender, EventArgs e)
 
         private void btnStartStop_Click(object sender, EventArgs e)
         {
-            if (secList.Count == 0) return;
+            if (secList.Count < 20)
+            {
+                mf.YesMessageBox("Not enough points to make a boundary");
+                return;
+            }
 
             arr = new vec3[secList.Count];
             prevHeading = Math.PI + glm.PIBy2;
diff --git a/SourceCode/GPS/Forms/FormGPS.cs b/SourceCode/GPS/Forms/FormGPS.cs
index a800d9b0e..d13da37fd 100644
--- a/SourceCode/GPS/Forms/FormGPS.cs
+++ b/SourceCode/GPS/Forms/FormGPS.cs
@@ -513,7 +513,7 @@ private void FormGPS_Load(object sender, EventArgs e)
             tramLinesMenuField.Text = gStr.gsTramLines;
             recordedPathStripMenu.Text = gStr.gsRecordedPathMenu;
             flagByLatLonToolStripMenuItem.Text = gStr.gsFlagByLatLon;
-            boundaryToolToolStripMenu.Text = gStr.gsBoundaryMenu;
+            boundaryToolToolStripMenu.Text = gStr.gsBoundary + " Tool";
 
             webcamToolStrip.Text = gStr.gsWebCam;
             offsetFixToolStrip.Text = gStr.gsOffsetFix;
diff --git a/SourceCode/GPS/Forms/Guidance/FormHeadAche.cs b/SourceCode/GPS/Forms/Guidance/FormHeadAche.cs
index a279151b5..10da9cc27 100644
--- a/SourceCode/GPS/Forms/Guidance/FormHeadAche.cs
+++ b/SourceCode/GPS/Forms/Guidance/FormHeadAche.cs
@@ -63,13 +63,6 @@ private void FormHeadLine_Load(object sender, EventArgs e)
 
         private void FormHeadLine_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //hdl
-            if (mf.hdl.idx == -1)
-            {
-                if (mf.isBtnAutoSteerOn) mf.btnAutoSteer.PerformClick();
-                if (mf.yt.isYouTurnBtnOn) mf.btnAutoYouTurn.PerformClick();
-            }
-
             mf.FileSaveHeadLines();
 
             if (mf.hdl.tracksArr.Count > 0)
diff --git a/SourceCode/GPS/Forms/Guidance/FormHeadLine.cs b/SourceCode/GPS/Forms/Guidance/FormHeadLine.cs
index 812dcf0e2..14d6862da 100644
--- a/SourceCode/GPS/Forms/Guidance/FormHeadLine.cs
+++ b/SourceCode/GPS/Forms/Guidance/FormHeadLine.cs
@@ -119,13 +119,6 @@ private void FormHeadLine_ResizeEnd(object sender, EventArgs e)
 
         private void FormHeadLine_FormClosing(object sender, FormClosingEventArgs e)
         {
-            //hdl
-            if (mf.hdl.idx == -1)
-            {
-                if (mf.isBtnAutoSteerOn) mf.btnAutoSteer.PerformClick();
-                if (mf.yt.isYouTurnBtnOn) mf.btnAutoYouTurn.PerformClick();
-            }
-
             if (sliceArr.Count > 0)
             {
                 mf.hdl.idx = 0;
diff --git a/SourceCode/GPS/Forms/SaveOpen.Designer.cs b/SourceCode/GPS/Forms/SaveOpen.Designer.cs
index 85b47a82b..4820a49f0 100644
--- a/SourceCode/GPS/Forms/SaveOpen.Designer.cs
+++ b/SourceCode/GPS/Forms/SaveOpen.Designer.cs
@@ -528,8 +528,6 @@ public void FileSaveHeadLines()
                     return;
                 }
             }
-
-            if (hdl.idx > (hdl.tracksArr.Count - 1)) hdl.idx = hdl.tracksArr.Count - 1;
         }
 
         public void FileLoadHeadLines()
diff --git a/SourceCode/GPS/References/GPS_Out.exe b/SourceCode/GPS/References/GPS_Out.exe
index 3430a9d27..63b08c28d 100644
Binary files a/SourceCode/GPS/References/GPS_Out.exe and b/SourceCode/GPS/References/GPS_Out.exe differ