diff --git a/src/config/ConfigManager.cpp b/src/config/ConfigManager.cpp
index f48f1dcd..ff37f42e 100644
--- a/src/config/ConfigManager.cpp
+++ b/src/config/ConfigManager.cpp
@@ -22,6 +22,18 @@ CConfigManager::CConfigManager() {
 void CConfigManager::init() {
     loadConfigLoadVars();
 
+    const char* const ENVHOME = getenv("HOME");
+
+    const std::string CONFIGPATH = ENVHOME + (ISDEBUG ? (std::string) "/.config/hypr/hyprlandd.conf" : (std::string) "/.config/hypr/hyprland.conf");
+
+    struct stat fileStat;
+    int err = stat(CONFIGPATH.c_str(), &fileStat);
+    if (err != 0) {
+        Debug::log(WARN, "Error at statting config, error %i", errno);
+    }
+
+    lastModifyTime = fileStat.st_mtime;
+
     isFirstLaunch = false;
 }
 
@@ -86,8 +98,8 @@ void CConfigManager::handleMonitor(const std::string& command, const std::string
             curitem = argZ.substr(0, idx);
             argZ = argZ.substr(idx + 1);
         } else {
-            argZ = "";
             curitem = argZ;
+            argZ = "";
         }
     };
 
@@ -268,6 +280,8 @@ SMonitorRule CConfigManager::getMonitorRuleFor(std::string name) {
     if (found)
         return *found;
 
+    Debug::log(WARN, "No rule found for %s, trying to use the first.", name.c_str());
+
     for (auto& r : m_dMonitorRules) {
         if (r.name == "") {
             found = &r;
@@ -278,5 +292,7 @@ SMonitorRule CConfigManager::getMonitorRuleFor(std::string name) {
     if (found)
         return *found;
 
+    Debug::log(WARN, "No rules configured. Using the default hardcoded one.");
+
     return SMonitorRule{.name = "", .resolution = Vector2D(1280, 720), .offset = Vector2D(0, 0), .mfact = 0.5f, .scale = 1};
 }
\ No newline at end of file
diff --git a/src/events/Events.cpp b/src/events/Events.cpp
index 6baaeebb..9f82f79c 100644
--- a/src/events/Events.cpp
+++ b/src/events/Events.cpp
@@ -232,6 +232,8 @@ void Events::listener_commitWindow(wl_listener* listener, void* data) {
 void Events::listener_destroyWindow(wl_listener* listener, void* data) {
     CWindow* PWINDOW = wl_container_of(listener, PWINDOW, listen_destroyWindow);
 
+    g_pLayoutManager->getCurrentLayout()->onWindowRemoved(PWINDOW);
+
     g_pCompositor->removeWindowFromVectorSafe(PWINDOW);
 
     Debug::log(LOG, "Window %x destroyed", PWINDOW);