diff --git a/.gitignore b/.gitignore
index adf5229..e6c996c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -463,3 +463,13 @@ out/build/x86-Debug/.cmake/api/v1/reply/index-2020-01-28T17-35-38-0764.json
 out/build/x86-Debug/.cmake/api/v1/reply/codemodel-v2-6a61e390ef8eaf17e9f8.json
 out/build/x86-Debug/Server.cfg
 *Server.cfg*
+*.cmake
+*.make
+*.xml
+*.includecache
+cmake-build-release/include/commandline/Makefile
+*.lib
+*.cbp
+*.marks
+*.internal
+*.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index e87924b..3b1ed6e 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -5,6 +5,11 @@
     <mapping directory="$PROJECT_DIR$/asio" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/include/commandline" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/rapidjson" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rapidjson/thirdparty/gtest" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/socket.io-client-cpp" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/socket.io-client-cpp/lib/asio" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/socket.io-client-cpp/lib/catch" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/socket.io-client-cpp/lib/rapidjson" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/socket.io-client-cpp/lib/websocketpp" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/include/Compat.h b/include/Compat.h
index 9fd3a1e..6c3953d 100644
--- a/include/Compat.h
+++ b/include/Compat.h
@@ -22,10 +22,10 @@ inline void CloseSocketProper(int socket) {
 
 #ifdef WIN32
 #include <conio.h>
-#include <windows.h>
+#include <winsock2.h>
 inline void CloseSocketProper(int socket) {
-    shutdown(socket, SHUT_RDWR);
-    close(socket);
+    shutdown(socket, SD_BOTH);
+    closesocket(socket);
 }
 #endif // WIN32
 
diff --git a/include/TLuaEngine.h b/include/TLuaEngine.h
index 40d8a7a..b4f171b 100644
--- a/include/TLuaEngine.h
+++ b/include/TLuaEngine.h
@@ -4,6 +4,7 @@
 #include "IThreaded.h"
 #include "TLuaFile.h"
 #include "TServer.h"
+#include <optional>
 #include <lua.hpp>
 #include <memory>
 #include <set>
diff --git a/include/TPPSMonitor.h b/include/TPPSMonitor.h
index 44a0ff4..43b5759 100644
--- a/include/TPPSMonitor.h
+++ b/include/TPPSMonitor.h
@@ -2,7 +2,7 @@
 
 #include "Common.h"
 #include "TServer.h"
-
+#include <optional>
 class TPPSMonitor : public IThreaded {
 public:
     explicit TPPSMonitor(TServer& Server);
diff --git a/include/TTCPServer.h b/include/TTCPServer.h
index f898e1b..d0edc8d 100644
--- a/include/TTCPServer.h
+++ b/include/TTCPServer.h
@@ -5,6 +5,7 @@
 #include "Compat.h"
 #include "IThreaded.h"
 #include "TServer.h"
+#include <optional>
 
 class TResourceManager;
 
diff --git a/src/TLuaFile.cpp b/src/TLuaFile.cpp
index a0f6ef8..efbb0e9 100644
--- a/src/TLuaFile.cpp
+++ b/src/TLuaFile.cpp
@@ -178,11 +178,11 @@ void SafeExecution(TLuaEngine& Engine, TLuaFile* lua, const std::string& FuncNam
     if (lua_isfunction(luaState, -1)) {
         char* Origin = ThreadOrigin(lua);
 #ifdef WIN32
-        __try {
+        //__try {
             int R = lua_pcall(luaState, 0, 0, 0);
             CheckLua(luaState, R);
-        } __except (Handle(GetExceptionInformation(), Origin)) {
-        }
+        /*} __except (Handle(GetExceptionInformation(), Origin)) {
+        }*/
 #else // unix
         int R = lua_pcall(luaState, 0, 0, 0);
         CheckLua(luaState, R);
diff --git a/src/TUDPServer.cpp b/src/TUDPServer.cpp
index 83d5586..4407c41 100644
--- a/src/TUDPServer.cpp
+++ b/src/TUDPServer.cpp
@@ -2,6 +2,7 @@
 #include "CustomAssert.h"
 #include "TTCPServer.h"
 #include <any>
+#include <array>
 #include <cstring>
 #include <utility>
 
@@ -119,7 +120,7 @@ void TUDPServer::UDPSend(TClient& Client, std::string Data) const {
         return;
     }
     sockaddr_in Addr = Client.GetUDPAddr();
-    socklen_t AddrSize = sizeof(Client.GetUDPAddr());
+    auto AddrSize = sizeof(Client.GetUDPAddr());
     if (Data.length() > 400) {
         std::string CMP(Comp(Data));
         Data = "ABG:" + CMP;
@@ -159,7 +160,12 @@ void TUDPServer::UDPSend(TClient& Client, std::string Data) const {
 std::string TUDPServer::UDPRcvFromClient(sockaddr_in& client) const {
     size_t clientLength = sizeof(client);
     std::array<char, 1024> Ret {};
+#ifdef WIN32
+    int64_t Rcv = recvfrom(mUDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (int*)&clientLength);
+#else // unix
     int64_t Rcv = recvfrom(mUDPSock, Ret.data(), Ret.size(), 0, (sockaddr*)&client, (socklen_t*)&clientLength);
+#endif // WIN32
+
     if (Rcv == -1) {
 #ifdef WIN32
         error(("(UDP) Error receiving from Client! Code : ") + std::to_string(WSAGetLastError()));
diff --git a/src/main.cpp b/src/main.cpp
index 9048c12..3620e46 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -8,9 +8,9 @@
 #include "TUDPServer.h"
 #include <iostream>
 #include <thread>
+#include <TTCPServer.h>
 
 #ifdef __unix
-#include <TTCPServer.h>
 #include <csignal>
 
 void UnixSignalHandler(int sig) {