diff --git a/SKSE/Plugins/ArtifactTracker.dll b/SKSE/Plugins/ArtifactTracker.dll
index fc82ace..f7e6019 100644
Binary files a/SKSE/Plugins/ArtifactTracker.dll and b/SKSE/Plugins/ArtifactTracker.dll differ
diff --git a/Source/ArtifactTrackerDLL/CMakeLists.txt b/Source/ArtifactTrackerDLL/CMakeLists.txt
index 358c2e5..e358768 100644
--- a/Source/ArtifactTrackerDLL/CMakeLists.txt
+++ b/Source/ArtifactTrackerDLL/CMakeLists.txt
@@ -7,7 +7,7 @@ message("Using toolchain file ${CMAKE_TOOLCHAIN_FILE}.")
 project(
         ArtifactTracker
         VERSION 1.0.0
-        DESCRIPTION "Eddoursul's Artifact Tracker"
+        DESCRIPTION "Artifact Tracker"
         LANGUAGES CXX)
 set(CMAKE_CXX_STANDARD 23)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
diff --git a/Source/ArtifactTrackerDLL/cmake/version.rc.in b/Source/ArtifactTrackerDLL/cmake/version.rc.in
index c0d89e4..93ca658 100644
--- a/Source/ArtifactTrackerDLL/cmake/version.rc.in
+++ b/Source/ArtifactTrackerDLL/cmake/version.rc.in
@@ -17,12 +17,14 @@ BEGIN
 	BEGIN
 		BLOCK "040904b0"
 		BEGIN
+			VALUE "CompanyName", "Eddoursul (www.eddoursul.win)"
 			VALUE "FileDescription", "@PROJECT_DESCRIPTION@"
 			VALUE "FileVersion", "@PROJECT_VERSION@"
 			VALUE "InternalName", "@PROJECT_NAME@"
-			VALUE "LegalCopyright", "MIT License"
+			VALUE "LegalCopyright", "GNU Lesser General Public License"
 			VALUE "ProductName", "@PROJECT_FRIENDLY_NAME@"
 			VALUE "ProductVersion", "@PROJECT_VERSION@"
+			VALUE "OriginalFilename", "@PROJECT_NAME@.dll"
 		END
 	END
 	BLOCK "VarFileInfo"
diff --git a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
index 903729c..2960ce5 100644
--- a/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
+++ b/Source/ArtifactTrackerDLL/src/ArtifactTracker.cpp
@@ -34,7 +34,7 @@ namespace ArtifactTracker
 
 		if (!dataHandler) {
 			// Called before kDataLoaded?
-			log::error("RE::TESDataHandler is not initialized.");
+			log::error("DataHandler is not initialized.");
 			return false;
 		}
 
@@ -169,7 +169,8 @@ namespace ArtifactTracker
 			return true;
 		});
 
-		if (g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size() != g_artifactMap.size()) {
+		std::uint32_t savedCount = g_listStored->forms.size() + g_listFound->forms.size() + g_listNew->forms.size();
+		if (savedCount != g_artifactMap.size()) {
 			log::info("Reverting g_listNew");
 			ListRevert(g_listNew);
 		}
@@ -355,7 +356,7 @@ namespace ArtifactTracker
 		}
 
 		if (cellStorage) {
-			if (!g_persistentStorage->HasForm(cellStorage)) {
+			if (!g_persistentMap.contains(cellStorage->formID)) {
 				g_persistentStorage->AddForm(cellStorage);
 				g_persistentMap[cellStorage->formID] = cellStorage;
 			}
@@ -582,7 +583,7 @@ namespace ArtifactTracker
 					g_listStored->AddForm(form);
 				}
 
-			} else if (a_event->oldContainer == 0x14) {  // dropped, consumed, dismantle, removed by script
+			} else if (a_event->oldContainer == 0x14) {  // dropped, consumed, dismantled, removed by script
 
 				if (!g_listStored->HasForm(form)) {
 					if (!GetItemCount(RE::PlayerCharacter::GetSingleton(), form) && !FollowersHaveItem(form)) {
@@ -649,7 +650,7 @@ namespace ArtifactTracker
 				} else {
 					const auto container = ref->As<RE::TESObjectREFR>();
 					if (container) {
-						if (g_cellStorage && IsInSameCell(container)) {  // deleted from container at home
+						if (g_cellStorage && IsInSameCell(container)) {  // removed from container at home
 
 							if (!GetItemCount(container, form)) {
 								SyncCellStorage(container);
@@ -726,7 +727,7 @@ namespace ArtifactTracker
 
 	void OnLocationChange()
 	{
-		std::uint32_t iCurrentFollowers = 0;
+		std::int32_t iCurrentFollowers = 0;
 
 		for (const auto& actor : GetPlayerFollowers()) {
 			iCurrentFollowers += actor->formID;