diff --git a/locale/ExpGaming-Core/ExpGaming - Rank Control.lua b/locale/ExpGaming-Core/ExpGaming - Rank Control.lua
index eb5a0c88..5d568318 100644
--- a/locale/ExpGaming-Core/ExpGaming - Rank Control.lua	
+++ b/locale/ExpGaming-Core/ExpGaming - Rank Control.lua	
@@ -71,8 +71,8 @@ function ranking.rank_print(msg, rank, inv)
 	end
 end
 --Give the user their new rank and raise the Event.rank_change event
-function ranking.give_rank(player,rank,by_player,group_tick)
-	local tick = group_tick or game.tick
+function ranking.give_rank(player,rank,by_player,tick)
+	local tick = tick or game.tick
 	local by_player = by_player or 'server'
 	local rank = ranking.string_to_rank(rank) or rank or ranking.string_to_rank_group('User').lowest_rank
 	local old_rank = ranking.get_player_rank(player)
@@ -102,7 +102,7 @@ function ranking.revert_rank(player,by_player)
 	ranking.give_rank(player,rank,by_player)
 end
 --Give the player a new rank based on playtime and/or preset ranks
-function ranking.find_new_rank(player,group_tick)
+function ranking.find_new_rank(player,tick)
 	debug_write({'RANK','NEW-RANK','START'},player.name)
 	local function loop_preset_rank(players,rank)
 		debug_write({'RANK','NEW-RANK','LOOP-PRESET'},rank)
@@ -110,7 +110,7 @@ function ranking.find_new_rank(player,group_tick)
 			if player.name:lower() == p:lower() then return rank end
 		end
 	end
-	local tick = group_tick or game.tick
+	local tick = tick or game.tick
 	local current_rank = ranking.get_player_rank(player)
 	local old_rank = ranking.get_player_rank(player)
 	local possible_ranks = {current_rank}
diff --git a/locale/ExpGaming-Core/GUI/ExpGaming - Toolbar.lua b/locale/ExpGaming-Core/GUI/ExpGaming - Toolbar.lua
index dde98f2f..3ce93e4c 100644
--- a/locale/ExpGaming-Core/GUI/ExpGaming - Toolbar.lua	
+++ b/locale/ExpGaming-Core/GUI/ExpGaming - Toolbar.lua	
@@ -22,7 +22,7 @@ local toolbar = ExpGui.toolbar
 --similar to ExpGui.add_input.button but it also accepts a restriction and button is drawn to the toolbar
 function toolbar.add_button(name,default_display,default_tooltip,event)
 	if not name then error('Button requires a name') end
-	table.insert(toolbar.buttons,{name=name})
+	table.insert(toolbar.buttons,name)
 	ExpGui.add_input.button(name,default_display,default_tooltip,event)
 end
 --draw the toolbar to the player only showing buttons within their restriction
@@ -33,9 +33,9 @@ function toolbar.draw(player)
 	toolbar_frame.clear()
 	for _,button in pairs(toolbar.buttons) do
 		local rank = ranking.get_player_rank(player)
-		if ranking.rank_allowed(ranking.get_player_rank(player),button.name) then
-			debug_write({'GUI','TOOLBAR','ADD'},button.name)
-			ExpGui.add_input.draw_button(toolbar_frame,button.name)
+		if ranking.rank_allowed(ranking.get_player_rank(player),button) then
+			debug_write({'GUI','TOOLBAR','ADD'},button)
+			ExpGui.add_input.draw_button(toolbar_frame,button)
 		end
 	end
 end