diff --git a/changelog.md b/changelog.md
index ddfe732..d4beb50 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,6 +3,8 @@
 - Fixed Crash removing checkpoints with checkpoint limit bypass enabled (thanks @hiimjustin000)
 - Actually fixed not being able to exit practice mode with Comfirm Practice enabled
 - Fixed not being able to scroll in the qolmod popup
+- Fixed dying in noclip breaking the cps counter
+- FINALLY fixed the touch issues with popups
 - Added **No Dash Fire**
 
 # 1.5.1
diff --git a/src/Labels/Labels.cpp b/src/Labels/Labels.cpp
index ec017cb..3535030 100644
--- a/src/Labels/Labels.cpp
+++ b/src/Labels/Labels.cpp
@@ -301,12 +301,15 @@ void StatusNode::update(float dt)
         }
     }
 
-    for (size_t i = 0; i < cps.size(); i++)
+    if (dt != -1)
     {
-        cps[i] -= dt / CCScheduler::get()->getTimeScale();
-    }
+        for (size_t i = 0; i < cps.size(); i++)
+        {
+            cps[i] -= dt / CCScheduler::get()->getTimeScale();
+        }
 
-    cps.erase(std::remove_if(cps.begin(), cps.end(), [](float i){ return i < 0; }), cps.end());
+        cps.erase(std::remove_if(cps.begin(), cps.end(), [](float i){ return i < 0; }), cps.end());
+    }
 
     sLabels[8]->setString((cpsM->options[1]->enabled ? fmt::format("{} / {} CPS", cps.size(), totalClicks) : fmt::format("{} CPS", cps.size(), totalClicks)).c_str());
 
diff --git a/src/Layers/SillyBaseLayer.cpp b/src/Layers/SillyBaseLayer.cpp
index 58946a1..5172e99 100644
--- a/src/Layers/SillyBaseLayer.cpp
+++ b/src/Layers/SillyBaseLayer.cpp
@@ -15,7 +15,7 @@ bool SillyBaseLayer::setup()
 
     this->runAction(CCFadeTo::create(1, 100));
     this->setKeypadEnabled(true);
-    this->setTouchEnabled(false);
+    this->setTouchEnabled(true);
 
     auto l = CCMenu::create();
     l->setContentSize(size);
@@ -140,7 +140,7 @@ bool SillyBaseLayer::initWithSizeAndName(CCPoint size, std::string _title, bool
 
 bool SillyBaseLayer::ccTouchBegan(cocos2d::CCTouch* p0, cocos2d::CCEvent* p1)
 {
-    return false;
+    return true;
 }
 
 void SillyBaseLayer::ccTouchMoved(cocos2d::CCTouch* p0, cocos2d::CCEvent* p1)