diff --git a/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll b/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll
index 9e6db4c..bfd2082 100644
--- a/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll
+++ b/Project/Binaries/Win64/UnrealEditor-GasaEditor.dll
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cb9da4955b87ca673e2193c41b05cdc57340e70334ddc52b5cfdbad0792583f1
+oid sha256:36bd29b06747f05f67c12ab6dcce9e0da7f419b2e02c9051327cf1419f07ddbd
 size 79360
diff --git a/Project/Content/Core/Pickups/BP_HealthPotion_RawEffect.uasset b/Project/Content/Core/Pickups/BP_HealthPotion_RawEffect.uasset
index 07247c8..95c9752 100644
--- a/Project/Content/Core/Pickups/BP_HealthPotion_RawEffect.uasset
+++ b/Project/Content/Core/Pickups/BP_HealthPotion_RawEffect.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9c38c12e410f92c096553636a5527d290df60a302e4eba83ca2d98602b13d37c
-size 43530
+oid sha256:1ba43c30f9059ee9bdfcc53789e8f97c34ab6ef213c79b2534f70d0892a0721c
+size 46379
diff --git a/Project/Content/Core/Pickups/BP_ManaPotion_RawEffect.uasset b/Project/Content/Core/Pickups/BP_ManaPotion_RawEffect.uasset
index 1b597b1..03c70c4 100644
--- a/Project/Content/Core/Pickups/BP_ManaPotion_RawEffect.uasset
+++ b/Project/Content/Core/Pickups/BP_ManaPotion_RawEffect.uasset
@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:a2ed9e042222b10e74046aad5ba468ff5917d3cf377db33282d74f61e72b4567
-size 43448
+oid sha256:9895a29978f430d250a63dc180d2082b4c039f598161a385e389b88f2c9597d1
+size 49171
diff --git a/Project/Source/Gasa/AbilitySystem/GasaEffectActor.cpp b/Project/Source/Gasa/AbilitySystem/GasaEffectActor.cpp
index e8e8559..f4b4783 100644
--- a/Project/Source/Gasa/AbilitySystem/GasaEffectActor.cpp
+++ b/Project/Source/Gasa/AbilitySystem/GasaEffectActor.cpp
@@ -19,5 +19,6 @@ void AGasaEffectActor::ApplyEffectToActor(AActor* Actor, TSubclassOf<UGameplayEf
 	Context.AddSourceObject(Actor);
 	
 	FGameplayEffectSpecHandle Spec = AS->MakeOutgoingSpec( EffectClass, 1.0f, Context );
-	AS->ApplyGameplayEffectSpecToSelf( * Spec.Data );
+	if (Spec.IsValid())
+		AS->ApplyGameplayEffectSpecToSelf( * Spec.Data );
 }
diff --git a/Project/Source/Gasa/Game/GasaGameState.cpp b/Project/Source/Gasa/Game/GasaGameState.cpp
index 19b03b4..2cfadd6 100644
--- a/Project/Source/Gasa/Game/GasaGameState.cpp
+++ b/Project/Source/Gasa/Game/GasaGameState.cpp
@@ -29,7 +29,6 @@ AGasaGameState::AGasaGameState()
 void AGasaGameState::OnGameFrameworkInitialized()
 {
 	NetLog("Received gameplay framework initialization.");
-
 	if (IsServer())
 	{
 		if (PlayerArray.Num() > 0)
@@ -41,7 +40,6 @@ void AGasaGameState::OnGameFrameworkInitialized()
 			NetLog("Was not able to assign HostingPlayer!", ELogV::Error);
 		}
 	}
-
 	BP_OnGameFrameworkInitialized();
 }
 #pragma endregion GameFramework
@@ -71,7 +69,6 @@ void AGasaGameState::HandleBeginPlay()
 void AGasaGameState::SeamlessTravelTransitionCheckpoint(bool bToTransitionMap)
 {
 	Super::SeamlessTravelTransitionCheckpoint(bToTransitionMap);
-
 	NetLog("SeamlessTravelTransitionCheckpoint");
 	NetLog(FString("ToTransitionMap: ") + FString(bToTransitionMap ? "true" : "false"));
 
@@ -90,7 +87,6 @@ void AGasaGameState::SeamlessTravelTransitionCheckpoint(bool bToTransitionMap)
 void AGasaGameState::BeginPlay()
 {
 	Super::BeginPlay();
-
 	NetLog("BeginPlay");
 
 	// Notified as initialized here as any possible components should also be initialized by this point.
@@ -100,18 +96,20 @@ void AGasaGameState::BeginPlay()
 	GI->NotifyGameFrameworkClassReady(EGameFrameworkClassFlag::GameState);
 	
 #if ENABLE_COG
-    CogWindowManager = NewObject<UCogWindowManager>(this);
-    CogWindowManagerRef = CogWindowManager;
+	for (local_persist int32 do_once = 0; do_once == 0; ++ do_once )
+	{
+		CogWindowManager = NewObject<UCogWindowManager>(this);
+		CogWindowManagerRef = CogWindowManager;
 
-    // Add all the built-in windows
-    Cog::AddAllWindows(*CogWindowManager);
+		// Add all the built-in windows
+		Cog::AddAllWindows(*CogWindowManager);
+	}
 #endif //ENABLE_COG
 }
 
 void AGasaGameState::PostInitializeComponents()
 {
 	NetLog("PostInitializeComponents");
-
 	Super::PostInitializeComponents();
 
 	if ( ! GetWorld()->IsEditorWorld() && IsServer())
@@ -135,7 +133,8 @@ void AGasaGameState::Tick(float DeltaSeconds)
 	Super::Tick(DeltaSeconds);
 
 #if ENABLE_COG
-    CogWindowManager->Tick(DeltaSeconds);
+	if (CogWindowManager)
+		CogWindowManager->Tick(DeltaSeconds);
 #endif //ENABLE_COG
 }
 #pragma endregion Actor
diff --git a/Project/Source/Gasa/Game/GasaLevelScriptActor.h b/Project/Source/Gasa/Game/GasaLevelScriptActor.h
index 0272d12..1d6c284 100644
--- a/Project/Source/Gasa/Game/GasaLevelScriptActor.h
+++ b/Project/Source/Gasa/Game/GasaLevelScriptActor.h
@@ -52,7 +52,7 @@ public:
 
 #pragma region Actor
     void BeginPlay() override;
-#pragma region endActor
+#pragma endregion endActor
 };
 
 namespace Gasa