diff --git a/.gitignore b/.gitignore
index 0f5b4cd3..c817afe6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,4 @@ hgt
 /client/public/databases/units/old
 /client/plugins/databasemanager/index.js
 
+*.aps
diff --git a/installer/olympus.iss b/installer/olympus.iss
index 22a6c1f3..ded5848a 100644
--- a/installer/olympus.iss
+++ b/installer/olympus.iss
@@ -36,6 +36,7 @@ Source: "..\scripts\OlympusCommand.lua"; DestDir: "{app}\Mods\Services\Olympus\S
 Source: "..\scripts\unitPayloads.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion
 Source: "..\scripts\templates.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion 
 Source: "..\scripts\mist.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion 
+Source: "..\scripts\mods.lua"; DestDir: "{app}\Mods\Services\Olympus\Scripts"; Flags: ignoreversion 
 
 Source: "..\mod\*"; DestDir: "{app}\Mods\Services\Olympus"; Flags: ignoreversion recursesubdirs;
 
diff --git a/src/core/src/core.cpp b/src/core/src/core.cpp
index bb669de1..e52c7612 100644
--- a/src/core/src/core.cpp
+++ b/src/core/src/core.cpp
@@ -88,7 +88,7 @@ extern "C" DllExport int coreFrame(lua_State* L)
     frameCounter++;
 
     const std::chrono::duration<double> executionDuration = std::chrono::system_clock::now() - lastExecution;
-    if (executionDuration.count() > FRAMERATE_TIME_INTERVAL) {
+    if (executionDuration.count() > (20 * FRAMERATE_TIME_INTERVAL)) {
         if (executionDuration.count() > 0) {
             scheduler->setFrameRate(frameCounter / executionDuration.count());
             frameCounter = 0;
diff --git a/src/core/src/server.cpp b/src/core/src/server.cpp
index c3a609d6..1c5ded18 100644
--- a/src/core/src/server.cpp
+++ b/src/core/src/server.cpp
@@ -330,7 +330,7 @@ void Server::task()
                 .then([&listener]() {log("RESTServer starting to listen"); })
                 .wait();
             
-        while (runListener);
+        while (runListener) { Sleep(1000); };
 
         listener.close()
                 .then([&listener]() {log("RESTServer stopping connections"); })