diff --git a/src/game/Game/BallSystem.cpp b/src/game/Game/BallSystem.cpp
index 7be7d8a..b2026be 100644
--- a/src/game/Game/BallSystem.cpp
+++ b/src/game/Game/BallSystem.cpp
@@ -278,9 +278,7 @@ bool dd::Systems::BallSystem::Contact(const Events::Contact &event)
 EntityID dd::Systems::BallSystem::CreateBall()
 {
     auto ent = m_World->CloneEntity(Ball());
-
     m_World->RemoveComponent<Components::Template>(ent);
-
     //m_World->CommitEntity(ent);
 
     return ent;
@@ -332,11 +330,11 @@ bool dd::Systems::BallSystem::OnMultiBall(const dd::Events::MultiBall &event)
     auto ball2 = m_World->GetComponent<Components::Ball>(ent2);
     auto padTransform = event.padTransform;
     float x1 = padTransform->Position.x - 2, x2 = padTransform->Position.x + 2;
-    if (x1 < -3.1) {
-        x1 = 3;
+    if (x1 < -m_EdgeX) {
+        x1 = m_EdgeX - 0.2;
     }
-    if (x2 > 3.1) {
-        x2 = -3;
+    if (x2 > m_EdgeX) {
+        x2 = -m_EdgeX + 0.2;
     }
     transform1->Position = glm::vec3(x1, -5.5, -10);
     transform2->Position = glm::vec3(x2, -5.5, -10);
diff --git a/src/game/Game/LevelSystem.cpp b/src/game/Game/LevelSystem.cpp
index b3d6788..e3bee4e 100755
--- a/src/game/Game/LevelSystem.cpp
+++ b/src/game/Game/LevelSystem.cpp
@@ -87,16 +87,18 @@ void dd::Systems::LevelSystem::UpdateEntity(double dt, EntityID entity, EntityID
         } else {
             if (ball != nullptr && MultiBalls() > 0) {
                 SetMultiBalls(MultiBalls()-1);
+                //std::cout << "Multi Balls: " << MultiBalls() << std::endl;
                 m_World->RemoveEntity(entity);
             } else {
                 auto powerUp = m_World->GetComponent<Components::PowerUp>(entity);
                 if (powerUp != nullptr) {
                     SetPowerUps(PowerUps() - 1);
+                    //std::cout << "Power Ups: " << PowerUps() << std::endl;
                     m_World->RemoveEntity(entity);
                 } else {
                     if (brick != nullptr) {
                         m_LooseBricks--;
-                        //std::cout << m_LooseBricks << std::endl;
+                        //std::cout << "Loose Bricks: " << m_LooseBricks << std::endl;
                         m_World->RemoveEntity(entity);
                     }
                 }
@@ -151,8 +153,9 @@ void dd::Systems::LevelSystem::CreateLevel()
             CreateBrick(i, j, SpaceBetweenBricks(), SpaceToEdge(), num, m_Bricks[getter]);
             getter++;
         }
-        if (num == 1)
+        if (num == 1) {
             num = Lines();
+        }
     }
     m_LooseBricks = NumberOfBricks();
     SetRestarting(false);
diff --git a/src/game/Game/PadSystem.cpp b/src/game/Game/PadSystem.cpp
index 4fe3b6b..a118ae4 100755
--- a/src/game/Game/PadSystem.cpp
+++ b/src/game/Game/PadSystem.cpp
@@ -222,8 +222,8 @@ bool dd::Systems::PadSystem::OnContact(const dd::Events::Contact &event)
 
 bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event)
 {
-    EntityID entityPower;
-    EntityID entityPad;
+    EntityID entityPower = 0;
+    EntityID entityPad = 0;
     auto powerUp = m_World->GetComponent<Components::PowerUp>(event.Entity1);
     auto pad = m_World->GetComponent<Components::Pad>(event.Entity2);
     if (powerUp != nullptr) {
@@ -243,7 +243,7 @@ bool dd::Systems::PadSystem::OnContactPowerUp(const dd::Events::Contact &event)
         }
     }
 
-    if (entityPower == NULL || entityPad == NULL) {
+    if (entityPower == 0 || entityPad == 0) {
         return false;
     }