diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
index 6794c2a..ad575cf 100644
--- a/assets/bundles/bundle.properties
+++ b/assets/bundles/bundle.properties
@@ -72,6 +72,8 @@ setting.shar3.name = Change Bar Style [lightgray](made by shar)[]
 setting.gaycursor.name = Enable Mouse Trail Effect [lightgray](only for desktop)[]
 setting.allTeam.name = Display all teams' info on item tap
 setting.deadTarget.name = save locked target even if it's dead
+setting.linkedMass.name = Display mass driver link line
+setting.linkedNode.name = Display node link line
 
 #Dialog
 editmaxwave = Edit Waves(int)
diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties
index a64e857..68dc9d3 100644
--- a/assets/bundles/bundle_ko.properties
+++ b/assets/bundles/bundle_ko.properties
@@ -74,6 +74,8 @@ setting.shar3.name = 바 스타일 변경 [lightgray](shar 만듬)[]
 setting.gaycursor.name = 마우스 꼬리효과 [lightgray](PC 전용)[]
 setting.allTeam.name = 자원 탭에 모든 팀 표시
 setting.deadTarget.name = 고정 목표물이 죽더라도 계속 고정하기
+setting.linkedMass.name = 매스 드라이버 연결선 표시
+setting.linkedNode.name = 노드 연결선 표시
 
 #Dialog
 editmaxwave = 최대 단계 수정하기(정수)
diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index e94ec5b..985c57b 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -75,8 +75,8 @@ public class HudUi {
 
     @Nullable Teamc target;
 
-    Seq<MassDriver.MassDriverBuild> linkedMasses = new Seq<>();
-    Seq<Building> linkedNodes = new Seq<>();
+    public Seq<MassDriver.MassDriverBuild> linkedMasses = new Seq<>();
+    public Seq<Building> linkedNodes = new Seq<>();
 
     boolean remoteChanged = false;
 
@@ -178,21 +178,21 @@ public class HudUi {
     }
     public void setEvent(){
         Events.run(EventType.Trigger.draw, () -> {
-            if(locked && lockedTarget instanceof Healthc u && u.dead()) {
+            if(settings.getBool("deadTarget") && locked && lockedTarget != null && !Groups.all.contains(e -> e == lockedTarget)) {
                 lockedTarget = null;
                 locked = false;
             }
 
-            if(getTarget() instanceof MassDriver.MassDriverBuild mass){
+            if(settings.getBool("linkedMass") && getTarget() instanceof MassDriver.MassDriverBuild mass){
                 linkedMasses.clear();
                 drawMassLink(mass);
             }
-            if(getTarget() instanceof Building node){
+            if(settings.getBool("linkedNode") && getTarget() instanceof Building node){
                 linkedNodes.clear();
                 drawNodeLink(node);
             }
 
-            if(getTarget() != null && Core.settings.getBool("select")) {
+            if(Core.settings.getBool("select") && getTarget() != null) {
                 Posc entity = getTarget();
                 for(int i = 0; i < 4; i++){
                     float rot = i * 90f + 45f + (-Time.time) % 360f;
@@ -205,7 +205,7 @@ public class HudUi {
                     Teamc to = getTarget();
                     float sin = Mathf.absin(Time.time, 6f, 1f);
                     if(player.unit() instanceof BlockUnitUnit bu) Tmp.v1.set(bu.x() + bu.tile().block.offset, bu.y() + bu.tile().block.offset).sub(to.x(), to.y()).limit(bu.tile().block.size * tilesize + sin + 0.5f);
-                    else Tmp.v1.set(from.x(), from.y()).sub(to.x(), to.y()).limit(player.unit().hitSize / tilesize + sin + 0.5f);
+                    else Tmp.v1.set(from.x(), from.y()).sub(to.x(), to.y()).limit(player.unit().hitSize + sin + 0.5f);
 
                     float x2 = from.x() - Tmp.v1.x, y2 = from.y() - Tmp.v1.y,
                             x1 = to.x() + Tmp.v1.x, y1 = to.y() + Tmp.v1.y;
diff --git a/src/UnitInfo/core/SettingS.java b/src/UnitInfo/core/SettingS.java
index a530521..6f235c8 100644
--- a/src/UnitInfo/core/SettingS.java
+++ b/src/UnitInfo/core/SettingS.java
@@ -318,5 +318,7 @@ public class SettingS {
         addGraphicCheckSetting("gaycursor", false);
         addGraphicCheckSetting("allTeam", false);
         addGraphicCheckSetting("deadTarget", false);
+        addGraphicCheckSetting("linkedMass", true);
+        addGraphicCheckSetting("linkedNode", false);
     }
 }