diff --git a/.gitmodules.swp b/.gitmodules.swp
new file mode 100644
index 00000000..b195fc11
Binary files /dev/null and b/.gitmodules.swp differ
diff --git a/client/CMakeLists.txt b/client/CMakeLists.txt
index 6451ce19..86d69694 100644
--- a/client/CMakeLists.txt
+++ b/client/CMakeLists.txt
@@ -369,7 +369,6 @@ if(IOS)
     include(cmake/ios.cmake)
     include(cmake/ios-arch-fixup.cmake)
 elseif(APPLE AND NOT IOS AND NOT DEFINED MACOS_NE)
-    # include(cmake/osxtools.cmake)
     include(cmake/macos.cmake)
     elseif(APPLE AND NOT IOS AND MACOS_NE)
         include(cmake/macos_ne.cmake)
diff --git a/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h b/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
index f911e186..12bf89be 100644
--- a/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
+++ b/client/macos/networkextension/WireGuardNetworkExtension-Bridging-Header.h
@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ 
 #include "wireguard-go-version.h"
 #include "3rd/amneziawg-apple/Sources/WireGuardKitGo/wireguard.h"
 #include "3rd/amneziawg-apple/Sources/WireGuardKitC/WireGuardKitC.h"
@@ -20,7 +24,7 @@ bool key_eq(const uint8_t key1[WG_KEY_LEN], const uint8_t key2[WG_KEY_LEN]);
 
 void write_msg_to_log(const char* tag, const char* msg);
 
-// Khai báo hàm C để Swift có thể sử dụng
+// init function definition in C 
 void hev_socks5_tunnel_quit(void);
 // Updated function definition in C
 int hev_socks5_tunnel_main(const char* configFile, int fd);
diff --git a/client/macos/scripts/openvpn.sh b/client/macos/scripts/openvpn.sh
index 8c371618..a2937dd8 100644
--- a/client/macos/scripts/openvpn.sh
+++ b/client/macos/scripts/openvpn.sh
@@ -16,9 +16,6 @@ CONFIGURATION_BUILD_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos
 BUILT_PRODUCTS_DIR = $WORKINGDIR/3rd/OpenVPNAdapter/build/Release-macos
 EOF
 
-# Exclude UIKit, include Cocoa for macOS
-# echo "OTHER_LDFLAGS = -framework Cocoa" >> $WORKINGDIR/3rd/OpenVPNAdapter/Configuration/amnezia.xcconfig
-
 # Fetch the current macOS SDK version dynamically
 MACOSX_SDK=$(xcrun --sdk macosx --show-sdk-path | sed -E 's/.*MacOSX([0-9]+\.[0-9]+)\.sdk/\1/')
 
diff --git a/client/platforms/ios/PacketTunnelProvider+OpenVPN.swift b/client/platforms/ios/PacketTunnelProvider+OpenVPN.swift
index f1af7449..34a19fe5 100644
--- a/client/platforms/ios/PacketTunnelProvider+OpenVPN.swift
+++ b/client/platforms/ios/PacketTunnelProvider+OpenVPN.swift
@@ -47,7 +47,7 @@ extension PacketTunnelProvider {
         let configuration = OpenVPNConfiguration()
         configuration.fileContent = ovpnConfiguration
         if str.contains("cloak") {
-//            configuration.setPTCloak()
+           configuration.setPTCloak()
         }
 
         let evaluation: OpenVPNConfigurationEvaluation?
diff --git a/client/ui/notificationhandler.cpp b/client/ui/notificationhandler.cpp
index b8ad8957..dc5710a7 100644
--- a/client/ui/notificationhandler.cpp
+++ b/client/ui/notificationhandler.cpp
@@ -7,8 +7,6 @@
 
 #if defined(Q_OS_IOS) || defined(MACOS_NE)
 #  include "platforms/ios/iosnotificationhandler.h"
-// #elif defined(MACOS_NE)
-// #  include "platforms/ios/iosnotificationhandler.h"
 #else
 #  include "systemtray_notificationhandler.h"
 #endif
diff --git a/client/ui/systemtray_notificationhandler.h b/client/ui/systemtray_notificationhandler.h
index a3fb84cc..60bf0b35 100644
--- a/client/ui/systemtray_notificationhandler.h
+++ b/client/ui/systemtray_notificationhandler.h
@@ -8,7 +8,7 @@
 #include "notificationhandler.h"
 
 #include <QMenu>
-#include <QSystemTrayIcon>'QMenu' file not found
+#include <QSystemTrayIcon>
 
 class SystemTrayNotificationHandler : public NotificationHandler {
     Q_OBJECT