-Minor changes here and there. Starting work on version 5.3.

diff --git a/BagSync.lua b/BagSync.lua
index 994520d..1055dd1 100644
--- a/BagSync.lua
+++ b/BagSync.lua
@@ -137,9 +137,9 @@ function BagSync:PLAYER_LOGIN()
 	self:ScanTokens()

 	--check for minimap toggle
-	if BagSyncOpt.enableMinimap and not BagSync_MinimapButton:IsVisible() then
+	if BagSyncOpt.enableMinimap and BagSync_MinimapButton and not BagSync_MinimapButton:IsVisible() then
 		BagSync_MinimapButton:Show()
-	elseif not BagSyncOpt.enableMinimap and BagSync_MinimapButton:IsVisible() then
+	elseif not BagSyncOpt.enableMinimap and BagSync_MinimapButton and BagSync_MinimapButton:IsVisible() then
 		BagSync_MinimapButton:Hide()
 	end

diff --git a/BagSync.toc b/BagSync.toc
index d01fcf6..165c73d 100644
--- a/BagSync.toc
+++ b/BagSync.toc
@@ -2,7 +2,7 @@
 ## Title: BagSync
 ## Notes: BagSync tracks your characters items and displays it within tooltips.
 ## Author: Xruptor
-## Version: 5.1
+## Version: 5.3
 ## SavedVariables: BagSyncDB, BagSyncOpt, BagSyncGUILD_DB, BagSyncTOKEN_DB

 localization\localization.lua
@@ -13,8 +13,8 @@ libs\tekKonfigDropdown.lua
 libs\LibItemSearch-1.0.lua
 libs\LibDataBroker-1.1.lua

+BagSync_Minimap.lua
 BagSync_Search.lua
 BagSync_Tokens.lua
 BagSync_Profiles.lua
-BagSync_Minimap.lua
 BagSync.lua
\ No newline at end of file
diff --git a/BagSync_Minimap.lua b/BagSync_Minimap.lua
index de902ad..1a3dfd5 100644
--- a/BagSync_Minimap.lua
+++ b/BagSync_Minimap.lua
@@ -2,7 +2,6 @@
 --So people can stop PESTERING me about a dang button, why can't they just use DataBroker sheesh

 local bgMinimapButton = CreateFrame("Frame","BagSync_MinimapButton", Minimap)
-bgMinimapButton:SetScript("OnEvent", function(self, event, ...) if self[event] then return self[event](self, event, ...) end end)

 bgMinimapButton:SetHeight(32)
 bgMinimapButton:SetWidth(32)
diff --git a/BagSync_Profiles.lua b/BagSync_Profiles.lua
index 0d8c7c0..f9c627e 100644
--- a/BagSync_Profiles.lua
+++ b/BagSync_Profiles.lua
@@ -3,7 +3,6 @@ local currentPlayer = UnitName('player')
 local currentRealm = GetRealmName()

 local bgProfiles = CreateFrame("Frame","BagSync_ProfilesFrame", UIParent)
-bgProfiles:SetScript("OnEvent", function(self, event, ...) if self[event] then return self[event](self, event, ...) end end)

 bgProfiles:SetFrameStrata("HIGH")
 bgProfiles:SetToplevel(true)
diff --git a/BagSync_Search.lua b/BagSync_Search.lua
index a5564b4..57f19db 100644
--- a/BagSync_Search.lua
+++ b/BagSync_Search.lua
@@ -8,7 +8,6 @@ local GetItemInfo = _G['GetItemInfo']
 local ItemSearch = LibStub('LibItemSearch-1.0')

 local bgSearch = CreateFrame("Frame","BagSync_SearchFrame", UIParent)
-bgSearch:SetScript("OnEvent", function(self, event, ...) if self[event] then return self[event](self, event, ...) end end)

 local function escapeEditBox(self)
   self:SetAutoFocus(false)
diff --git a/BagSync_Tokens.lua b/BagSync_Tokens.lua
index a0be19a..cc36b63 100644
--- a/BagSync_Tokens.lua
+++ b/BagSync_Tokens.lua
@@ -6,7 +6,6 @@ local currentRealm = GetRealmName()
 local GetItemInfo = _G['GetItemInfo']

 local bgTokens = CreateFrame("Frame","BagSync_TokensFrame", UIParent)
-bgTokens:SetScript("OnEvent", function(self, event, ...) if self[event] then return self[event](self, event, ...) end end)

 bgTokens:SetFrameStrata("HIGH")
 bgTokens:SetToplevel(true)