diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index a8a2c81..f243b89 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,15 @@
         {
             "name": "Linux",
             "includePath": [
-                "${workspaceFolder}/**"
+                "${workspaceFolder}/**",
+                "${workspaceFolder}/BaseCommon/",
+                "${workspaceFolder}/APRS/",
+                "${workspaceFolder}/Common/",
+                "${workspaceFolder}/DStarBase/",
+                "${workspaceFolder}/IRCDDB/",
+                "${workspaceFolder}/VersionInfo/",
+                "${workspaceFolder}/BaseCommon/",
+                "${workspaceFolder}/BaseCommon"
             ],
             "defines": [],
             "compilerPath": "/bin/g++",
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 592d6ba..5cb32b0 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -33,7 +33,7 @@
         "type": "cppdbg",
         "request": "launch",
         "program": "${workspaceFolder}/DGWRemoteControl/dgwremotecontrol",
-        "args": ["--name", "blabla", "F4FXL  B", "linkk", "never", "DCS208_C"],
+        "args": ["--name", "city_center", "F4FXL  B", "link", "never", "DCS208_C"],
         "stopAtEntry": false,
         "cwd": "${workspaceFolder}",
         "environment": [],
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7b2b113..46b9b3b 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -10,9 +10,13 @@
             "args": [
                 "-j3",
                 "ENABLE_DEBUG=1",
-                "USE_GPSD=1"
+                "USE_GPSD=1",
+                "all"
             ],
-            "group": "build",
+            "group": {
+                "kind": "build",
+                "isDefault": true
+            },
             "problemMatcher": []
         },
         {
@@ -38,10 +42,7 @@
                 "USE_GPSD=1",
                 "DGWRemoteControl/dgwremotecontrol"
             ],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            },
+            "group": "build",
             "problemMatcher": []
         },
         {