Quantcast

Make coords 0,0 not display in tooltip

Ackis [10-22-08 - 18:14]
Make coords 0,0 not display in tooltip
Filename
ARLFrame.lua
diff --git a/ARLFrame.lua b/ARLFrame.lua
index 3e98b62..a6a0ac2 100644
--- a/ARLFrame.lua
+++ b/ARLFrame.lua
@@ -117,13 +117,13 @@ end
 -- Under various conditions, I'm going to have to redisplay my recipe list
 -- This could happen because a filter changes, a new profession is chosen, or
 -- a new search occurred. Use this function to do all the dirty work
-function ReDisplay( )
-	addon:UpdateFilters( recipeDB, allSpecTable, playerData )
-	sortedRecipeIndex = addon:SortMissingRecipes( recipeDB )
-	if ( not addon.db.profile.ignoreexclusionlist ) then
-		addon:GetExclusions( recipeDB )
+function ReDisplay()
+	addon:UpdateFilters(recipeDB, allSpecTable, playerData)
+	sortedRecipeIndex = addon:SortMissingRecipes(recipeDB)
+	if (not addon.db.profile.ignoreexclusionlist) then
+		addon:GetExclusions(recipeDB)
 	end
-	initDisplayStrings( )
+	initDisplayStrings()

 	-- Update our progressbar
 	local pbCur = playerData.foundRecipes
@@ -138,16 +138,16 @@ function ReDisplay( )
 		pbMax = (playerData.totalRecipes - playerData.filteredRecipes) + playerData.foundRecipes - playerData.otherRecipes
 	end

-	ARL_ProgressBar:SetMinMaxValues( pbMin, pbMax)
-	ARL_ProgressBar:SetValue( pbCur )
-	ARL_ProgressBarText:SetText( pbCur .. " / " .. pbMax .. " - " .. math.floor( pbCur / pbMax * 100) .. "%")
+	ARL_ProgressBar:SetMinMaxValues(pbMin, pbMax)
+	ARL_ProgressBar:SetValue(pbCur)
+	ARL_ProgressBarText:SetText(pbCur .. " / " .. pbMax .. " - " .. math.floor(pbCur / pbMax * 100) .. "%")

 	-- Make sure our expand all button is set to expandall
-	ARL_ExpandButton:SetText( L["EXPANDALL"] )
-	addon:TooltipDisplay( ARL_ExpandButton, L["EXPANDALL_DESC"] )
+	ARL_ExpandButton:SetText(L["EXPANDALL"])
+	addon:TooltipDisplay(ARL_ExpandButton, L["EXPANDALL_DESC"])

 	-- And update our scrollframe
-	RecipeList_Update( )
+	RecipeList_Update()
 end

 -- Create the scan button and add it to Skillet if applicable
@@ -171,15 +171,15 @@ function addon:CreateScanButton()
 	addon.ScanButton:RegisterForClicks("LeftButtonUp")
 	addon.ScanButton:SetScript("OnClick", function()
 		addon:ToggleFrame()
-	end )
+	end)
 	addon.ScanButton:SetScript("OnEnter", function(this)
 		GameTooltip_SetDefaultAnchor(GameTooltip, this)
 		GameTooltip:SetText(L["SCAN_RECIPES_DESC"])
 		GameTooltip:Show()
-	end )
+	end)
 	addon.ScanButton:SetScript("OnLeave", function()
 		GameTooltip:Hide()
-	end )
+	end)
 	addon.ScanButton:SetText(L["Scan Recipes"])
 	addon.ScanButton:Enable()

@@ -209,22 +209,22 @@ function addon:ShowScanButton()

 end

-function addon:TooltipDisplay( this, textLabel )
-	this:SetScript( "OnEnter",
-		function ( this )
-			GameTooltip_SetDefaultAnchor( GameTooltip, this )
-			GameTooltip:SetText( textLabel, HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b )
+function addon:TooltipDisplay(this, textLabel)
+	this:SetScript("OnEnter",
+		function (this)
+			GameTooltip_SetDefaultAnchor(GameTooltip, this)
+			GameTooltip:SetText(textLabel, HIGHLIGHT_FONT_COLOR.r, HIGHLIGHT_FONT_COLOR.g, HIGHLIGHT_FONT_COLOR.b)
 			GameTooltip:Show()
 		end
 	)
-	this:SetScript( "OnLeave",
-		function( this )
+	this:SetScript("OnLeave",
+		function(this)
 			GameTooltip:Hide()
 		end
 	)
 end

-function addon.numFilters ( )
+function addon.numFilters ()
 	-- IMPORTANT: If the number of filters we're maintaining changes, you'll need to change the FilterValueMap
 	-- at the end (of CreateFrame), as well as the following index value:
 	local MaxFilters = 84
@@ -233,10 +233,10 @@ function addon.numFilters ( )
 	local active = 0

 	for i = 1, MaxFilters do
-		if ( ( FilterValueMap[i].svroot == "disabled" ) or
-			 ( FilterValueMap[i].svroot == "special case" ) ) then
+		if ((FilterValueMap[i].svroot == "disabled") or
+			 (FilterValueMap[i].svroot == "special case")) then
 			-- ignore these filters in the totals
-		elseif ( FilterValueMap[i].svroot[ FilterValueMap[i].svval ] == true ) then
+		elseif (FilterValueMap[i].svroot[ FilterValueMap[i].svval ] == true) then
 			active = active + 1
 			total = total + 1
 		else
@@ -246,29 +246,29 @@ function addon.numFilters ( )
 	return active, total
 end

-function addon.resetTitle( )
+function addon.resetTitle()
 	-- reset the frame title line
 	local myTitle = ""
 	local addonversion = GetAddOnMetadata("AckisRecipeList", "Version")
-	if ( addon.Frame._Expanded == true ) then
+	if (addon.Frame._Expanded == true) then
 		local aFil, tFil = addon.numFilters()
 		myTitle = "ARL (v." .. addonversion .. ") - " .. currentProfession ..
 			" (" .. aFil .. "/" .. tFil .. " " .. L["Filters"] .. ")"
 	else
 		myTitle = "ARL (v." .. addonversion .. ") - " .. currentProfession
 	end
---	addon.Frame.HeadingText:SetText( addon:White( myTitle ) )
-	addon.Frame.HeadingText:SetText( addon:Normal( myTitle ) )
+--	addon.Frame.HeadingText:SetText(addon:White(myTitle))
+	addon.Frame.HeadingText:SetText(addon:Normal(myTitle))
 end

-function addon.filterSwitch( val )
+function addon.filterSwitch(val)
 	-- This function is the all-encompassing checkbox handler for the ZJGUI
 	local armordb = addon.db.profile.filters.item.armor
 	local weapondb = addon.db.profile.filters.item.weapon
 	-- Special cases first, then general case
-	if ( val == 19 ) then
+	if (val == 19) then
 		-- Armor "All" checkbox
-		if ( ARL_ArmorAllCB:GetChecked( ) ) then
+		if (ARL_ArmorAllCB:GetChecked()) then
 			armordb.cloth = true
 			armordb.leather = true
 			armordb.mail = true
@@ -277,19 +277,19 @@ function addon.filterSwitch( val )
 			armordb.necklace = true
 			armordb.ring = true
 			armordb.trinket = true
-			ARL_ArmorClothCB:SetChecked( true )
-			ARL_ArmorLeatherCB:SetChecked( true )
-			ARL_ArmorMailCB:SetChecked( true )
-			ARL_ArmorPlateCB:SetChecked( true )
-			ARL_ArmorCloakCB:SetChecked( true )
-			ARL_ArmorNecklaceCB:SetChecked( true )
-			ARL_ArmorRingCB:SetChecked( true )
-			ARL_ArmorTrinketCB:SetChecked( true )
-			ARL_ArmorNoneCB:SetChecked( false )
+			ARL_ArmorClothCB:SetChecked(true)
+			ARL_ArmorLeatherCB:SetChecked(true)
+			ARL_ArmorMailCB:SetChecked(true)
+			ARL_ArmorPlateCB:SetChecked(true)
+			ARL_ArmorCloakCB:SetChecked(true)
+			ARL_ArmorNecklaceCB:SetChecked(true)
+			ARL_ArmorRingCB:SetChecked(true)
+			ARL_ArmorTrinketCB:SetChecked(true)
+			ARL_ArmorNoneCB:SetChecked(false)
 		end
-	elseif ( val == 20 ) then
+	elseif (val == 20) then
 		-- Armor "None" checkbox
-		if ( ARL_ArmorNoneCB:GetChecked( ) ) then
+		if (ARL_ArmorNoneCB:GetChecked()) then
 			armordb.cloth = false
 			armordb.leather = false
 			armordb.mail = false
@@ -298,43 +298,43 @@ function addon.filterSwitch( val )
 			armordb.necklace = false
 			armordb.ring = false
 			armordb.trinket = false
-			ARL_ArmorClothCB:SetChecked( false )
-			ARL_ArmorLeatherCB:SetChecked( false )
-			ARL_ArmorMailCB:SetChecked( false )
-			ARL_ArmorPlateCB:SetChecked( false )
-			ARL_ArmorCloakCB:SetChecked( false )
-			ARL_ArmorNecklaceCB:SetChecked( false )
-			ARL_ArmorRingCB:SetChecked( false )
-			ARL_ArmorTrinketCB:SetChecked( false )
-			ARL_ArmorAllCB:SetChecked( false )
+			ARL_ArmorClothCB:SetChecked(false)
+			ARL_ArmorLeatherCB:SetChecked(false)
+			ARL_ArmorMailCB:SetChecked(false)
+			ARL_ArmorPlateCB:SetChecked(false)
+			ARL_ArmorCloakCB:SetChecked(false)
+			ARL_ArmorNecklaceCB:SetChecked(false)
+			ARL_ArmorRingCB:SetChecked(false)
+			ARL_ArmorTrinketCB:SetChecked(false)
+			ARL_ArmorAllCB:SetChecked(false)
 		end
-	elseif ( ( val == 21 ) or ( val == 22 ) or ( val == 23 ) or ( val == 24 ) or
-			 ( val == 64 ) or ( val == 65 ) or ( val == 66 ) or ( val == 67 ) ) then
+	elseif ((val == 21) or (val == 22) or (val == 23) or (val == 24) or
+			 (val == 64) or (val == 65) or (val == 66) or (val == 67)) then
 		-- in this case, we need to check if the checkbox we just hit either
 		-- makes everthing checked, or everything empty. If so, we check the All/None
 		-- checkboxes
-		if ( FilterValueMap[val].cb:GetChecked() ) then
+		if (FilterValueMap[val].cb:GetChecked()) then
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = true
-			if ( ( armordb.cloth == true ) and ( armordb.leather == true ) and
-				 ( armordb.mail == true ) and ( armordb.plate == true ) and
-				 ( armordb.cloak == true ) and ( armordb.necklace == true ) and
-				 ( armordb.ring == true ) and ( armordb.trinket == true ) ) then
-				ARL_ArmorAllCB:SetChecked( true )
+			if ((armordb.cloth == true) and (armordb.leather == true) and
+				 (armordb.mail == true) and (armordb.plate == true) and
+				 (armordb.cloak == true) and (armordb.necklace == true) and
+				 (armordb.ring == true) and (armordb.trinket == true)) then
+				ARL_ArmorAllCB:SetChecked(true)
 			end
-			ARL_ArmorNoneCB:SetChecked( false )
+			ARL_ArmorNoneCB:SetChecked(false)
 		else
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = false
-			if ( ( armordb.cloth == false ) and ( armordb.leather == false ) and
-				 ( armordb.mail == false ) and ( armordb.plate == false ) and
-				 ( armordb.cloak == false ) and ( armordb.necklace == false ) and
-				 ( armordb.ring == false ) and ( armordb.trinket == false ) ) then
-				ARL_ArmorNoneCB:SetChecked( true )
+			if ((armordb.cloth == false) and (armordb.leather == false) and
+				 (armordb.mail == false) and (armordb.plate == false) and
+				 (armordb.cloak == false) and (armordb.necklace == false) and
+				 (armordb.ring == false) and (armordb.trinket == false)) then
+				ARL_ArmorNoneCB:SetChecked(true)
 			end
-			ARL_ArmorAllCB:SetChecked( false )
+			ARL_ArmorAllCB:SetChecked(false)
 		end
-	elseif ( val == 25 ) then
+	elseif (val == 25) then
 		-- Weapon "All" special case
-		if ( ARL_WeaponAllCB:GetChecked() ) then
+		if (ARL_WeaponAllCB:GetChecked()) then
 			weapondb.onehand = true
 			weapondb.twohand = true
 			weapondb.dagger = true
@@ -345,21 +345,21 @@ function addon.filterSwitch( val )
 			weapondb.wand = true
 			weapondb.thrown = true
 			weapondb.ammo = true
-			ARL_Weapon1HCB:SetChecked( true )
-			ARL_Weapon2HCB:SetChecked( true )
-			ARL_WeaponDaggerCB:SetChecked( true )
-			ARL_WeaponAxeCB:SetChecked( true )
-			ARL_WeaponMaceCB:SetChecked( true )
-			ARL_WeaponSwordCB:SetChecked( true )
-			ARL_WeaponPolearmCB:SetChecked( true )
-			ARL_WeaponWandCB:SetChecked( true )
-			ARL_WeaponThrownCB:SetChecked( true )
-			ARL_WeaponAmmoCB:SetChecked( true )
-			ARL_WeaponNoneCB:SetChecked( false )
+			ARL_Weapon1HCB:SetChecked(true)
+			ARL_Weapon2HCB:SetChecked(true)
+			ARL_WeaponDaggerCB:SetChecked(true)
+			ARL_WeaponAxeCB:SetChecked(true)
+			ARL_WeaponMaceCB:SetChecked(true)
+			ARL_WeaponSwordCB:SetChecked(true)
+			ARL_WeaponPolearmCB:SetChecked(true)
+			ARL_WeaponWandCB:SetChecked(true)
+			ARL_WeaponThrownCB:SetChecked(true)
+			ARL_WeaponAmmoCB:SetChecked(true)
+			ARL_WeaponNoneCB:SetChecked(false)
 		end
-	elseif ( val == 26 ) then
+	elseif (val == 26) then
 		-- Weapon "None" special case
-		if ( ARL_WeaponNoneCB:GetChecked() ) then
+		if (ARL_WeaponNoneCB:GetChecked()) then
 			weapondb.onehand = false
 			weapondb.twohand = false
 			weapondb.dagger = false
@@ -370,48 +370,48 @@ function addon.filterSwitch( val )
 			weapondb.wand = false
 			weapondb.thrown = false
 			weapondb.ammo = false
-			ARL_Weapon1HCB:SetChecked( false )
-			ARL_Weapon2HCB:SetChecked( false )
-			ARL_WeaponDaggerCB:SetChecked( false )
-			ARL_WeaponAxeCB:SetChecked( false )
-			ARL_WeaponMaceCB:SetChecked( false )
-			ARL_WeaponSwordCB:SetChecked( false )
-			ARL_WeaponPolearmCB:SetChecked( false )
-			ARL_WeaponWandCB:SetChecked( false )
-			ARL_WeaponThrownCB:SetChecked( false )
-			ARL_WeaponAmmoCB:SetChecked( false )
-			ARL_WeaponAllCB:SetChecked( false )
+			ARL_Weapon1HCB:SetChecked(false)
+			ARL_Weapon2HCB:SetChecked(false)
+			ARL_WeaponDaggerCB:SetChecked(false)
+			ARL_WeaponAxeCB:SetChecked(false)
+			ARL_WeaponMaceCB:SetChecked(false)
+			ARL_WeaponSwordCB:SetChecked(false)
+			ARL_WeaponPolearmCB:SetChecked(false)
+			ARL_WeaponWandCB:SetChecked(false)
+			ARL_WeaponThrownCB:SetChecked(false)
+			ARL_WeaponAmmoCB:SetChecked(false)
+			ARL_WeaponAllCB:SetChecked(false)
 		end
-	elseif ( ( val == 34 ) or ( val == 36 ) or ( val == 37 ) ) then
+	elseif ((val == 34) or (val == 36) or (val == 37)) then
 		-- Weapon disable case ... there's really no way to reach this code
-	elseif ( ( val == 27 ) or ( val == 28 ) or ( val == 29 ) or ( val == 30 ) or ( val == 31 ) or
-			 ( val == 32 ) or ( val == 33 ) or ( val == 68 ) or ( val == 35 ) or ( val == 38 ) ) then
+	elseif ((val == 27) or (val == 28) or (val == 29) or (val == 30) or (val == 31) or
+			 (val == 32) or (val == 33) or (val == 68) or (val == 35) or (val == 38)) then
 		-- we've clicked on a weapon thinger. If all of them are either checked or unchecked,
 		-- we should automagically check the "All" or "None" checkbox
-		if ( FilterValueMap[val].cb:GetChecked() ) then
+		if (FilterValueMap[val].cb:GetChecked()) then
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = true
-			if ( ( weapondb.onehand == true ) and ( weapondb.twohand == true ) and
-				 ( weapondb.dagger == true ) and ( weapondb.axe == true ) and
-				 ( weapondb.mace == true ) and ( weapondb.sword == true ) and
-				 ( weapondb.polearm == true ) and ( weapondb.wand == true ) and
-				 ( weapondb.thrown == true ) and ( weapondb.ammo == true ) ) then
-				ARL_WeaponAllCB:SetChecked( true )
+			if ((weapondb.onehand == true) and (weapondb.twohand == true) and
+				 (weapondb.dagger == true) and (weapondb.axe == true) and
+				 (weapondb.mace == true) and (weapondb.sword == true) and
+				 (weapondb.polearm == true) and (weapondb.wand == true) and
+				 (weapondb.thrown == true) and (weapondb.ammo == true)) then
+				ARL_WeaponAllCB:SetChecked(true)
 			end
-			ARL_WeaponNoneCB:SetChecked( false )
+			ARL_WeaponNoneCB:SetChecked(false)
 		else
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = false
-			if ( ( weapondb.onehand == false ) and ( weapondb.twohand == false ) and
-				 ( weapondb.dagger == false ) and ( weapondb.axe == false ) and
-				 ( weapondb.mace == false ) and ( weapondb.sword == false ) and
-				 ( weapondb.polearm == false ) and ( weapondb.wand == false ) and
-				 ( weapondb.thrown == false ) and ( weapondb.ammo == false ) ) then
-				ARL_WeaponNoneCB:SetChecked( true )
+			if ((weapondb.onehand == false) and (weapondb.twohand == false) and
+				 (weapondb.dagger == false) and (weapondb.axe == false) and
+				 (weapondb.mace == false) and (weapondb.sword == false) and
+				 (weapondb.polearm == false) and (weapondb.wand == false) and
+				 (weapondb.thrown == false) and (weapondb.ammo == false)) then
+				ARL_WeaponNoneCB:SetChecked(true)
 			end
-			ARL_WeaponAllCB:SetChecked( false )
+			ARL_WeaponAllCB:SetChecked(false)
 		end
 	else
 		-- General case
-		if ( FilterValueMap[val].cb:GetChecked() ) then
+		if (FilterValueMap[val].cb:GetChecked()) then
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = true
 		else
 			FilterValueMap[val].svroot[ FilterValueMap[val].svval ] = false
@@ -421,23 +421,23 @@ function addon.filterSwitch( val )
 	addon.resetTitle()
 end

-function addon.ToggleFilters( )
+function addon.ToggleFilters()
 	local xPos = addon.Frame:GetLeft()
 	local yPos = addon.Frame:GetBottom()
-	if ( addon.Frame._Expanded == true ) then
+	if (addon.Frame._Expanded == true) then
 		-- Adjust the frame size and texture
 --		addon.Frame:Hide()
 		addon.Frame:ClearAllPoints()
 		addon.Frame:SetWidth(293)
 		addon.Frame:SetHeight(447)
-		addon.bgTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\main]] )
-		addon.bgTexture:SetAllPoints( addon.Frame )
-		addon.bgTexture:SetTexCoord( 0, (293/512), 0, (447/512) )
+		addon.bgTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\main]])
+		addon.bgTexture:SetAllPoints(addon.Frame)
+		addon.bgTexture:SetTexCoord(0, (293/512), 0, (447/512))
 		addon.Frame._Expanded = false
-		addon.Frame:SetPoint( "BOTTOMLEFT", UIParent, "BOTTOMLEFT", xPos, yPos )
+		addon.Frame:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", xPos, yPos)
 		-- Change the text and tooltip for the filter button
-		ARL_FilterButton:SetText( L["FILTER_OPEN"] )
-		addon:TooltipDisplay( ARL_FilterButton, L["FILTER_OPEN_DESC"] )
+		ARL_FilterButton:SetText(L["FILTER_OPEN"])
+		addon:TooltipDisplay(ARL_FilterButton, L["FILTER_OPEN_DESC"])

 		-- Hide my 5 buttons
 		ARL_ExpGeneralOptCB:Hide()
@@ -447,12 +447,12 @@ function addon.ToggleFilters( )
 		ARL_ExpPlayerOptCB:Hide()
 		ARL_ExpRepOptCB:Hide()
 		-- uncheck them as well
-		ARL_ExpGeneralOptCB:SetChecked( false )
-		ARL_ExpObtainOptCB:SetChecked( false )
-		ARL_ExpBindingOptCB:SetChecked( false )
-		ARL_ExpItemOptCB:SetChecked( false )
-		ARL_ExpPlayerOptCB:SetChecked( false )
-		ARL_ExpRepOptCB:SetChecked( false )
+		ARL_ExpGeneralOptCB:SetChecked(false)
+		ARL_ExpObtainOptCB:SetChecked(false)
+		ARL_ExpBindingOptCB:SetChecked(false)
+		ARL_ExpItemOptCB:SetChecked(false)
+		ARL_ExpPlayerOptCB:SetChecked(false)
+		ARL_ExpRepOptCB:SetChecked(false)
 		-- hide the flyaway
 		addon.Flyaway:Hide()

@@ -467,14 +467,14 @@ function addon.ToggleFilters( )
 		addon.Frame:ClearAllPoints()
 		addon.Frame:SetWidth(444)
 		addon.Frame:SetHeight(447)
-		addon.bgTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\expanded]] )
-		addon.bgTexture:SetAllPoints( addon.Frame )
-		addon.bgTexture:SetTexCoord( 0, (444/512), 0, (447/512) )
+		addon.bgTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\expanded]])
+		addon.bgTexture:SetAllPoints(addon.Frame)
+		addon.bgTexture:SetTexCoord(0, (444/512), 0, (447/512))
 		addon.Frame._Expanded = true
-		addon.Frame:SetPoint( "BOTTOMLEFT", UIParent, "BOTTOMLEFT", xPos, yPos )
+		addon.Frame:SetPoint("BOTTOMLEFT", UIParent, "BOTTOMLEFT", xPos, yPos)
 		-- Change the text and tooltip for the filter button
-		ARL_FilterButton:SetText( L["FILTER_CLOSE"] )
-		addon:TooltipDisplay( ARL_FilterButton, L["FILTER_CLOSE_DESC"] )
+		ARL_FilterButton:SetText(L["FILTER_CLOSE"])
+		addon:TooltipDisplay(ARL_FilterButton, L["FILTER_CLOSE_DESC"])

 		-- Show my 5 buttons
 		ARL_ExpGeneralOptCB:Show()
@@ -494,36 +494,36 @@ function addon.ToggleFilters( )
 	addon.resetTitle()
 end

-function addon:GenericMakeCB( cButton, anchorFrame, ttText, scriptVal, row, col, logo  )
+function addon:GenericMakeCB(cButton, anchorFrame, ttText, scriptVal, row, col, logo )
 	local pushdown = {
 		[64] = 1, [65] = 1, [66] = 1, [67] = 1, [25] = 1, [26] = 1, [27] = 1, [28] = 1, [29] = 1,
 		[30] = 1, [31] = 1, [32] = 1, [33] = 1, [34] = 1, [68] = 1, [35] = 1, [36] = 1, [37] = 1,
 		[38] = 1,
 	}
 	-- set the position of the new checkbox
-	local xPos = 2 + ( ( col - 1 ) * 100 )
-	local yPos = -3 - ( ( row - 1 ) * 17 )
-	if ( pushdown[scriptVal] ) then yPos = yPos - 5 end
-	cButton:SetPoint( "TOPLEFT", anchorFrame, "TOPLEFT", xPos, yPos )
+	local xPos = 2 + ((col - 1) * 100)
+	local yPos = -3 - ((row - 1) * 17)
+	if (pushdown[scriptVal]) then yPos = yPos - 5 end
+	cButton:SetPoint("TOPLEFT", anchorFrame, "TOPLEFT", xPos, yPos)

 	-- depending if we're on the rep logo thingers or not, set the height and an OnClick method
-	if ( logo == 0 ) then
-		cButton:SetHeight( 24 )
-		cButton:SetWidth( 24 )
-		cButton:SetScript( "OnClick", function() addon.filterSwitch( scriptVal ) end )
+	if (logo == 0) then
+		cButton:SetHeight(24)
+		cButton:SetWidth(24)
+		cButton:SetScript("OnClick", function() addon.filterSwitch(scriptVal) end)
 	else
-		cButton:SetHeight( 46 )
-		cButton:SetWidth( 100 )
-		cButton:SetScript( "OnClick", function() addon.filterSwitch( scriptVal ) end )
+		cButton:SetHeight(46)
+		cButton:SetWidth(100)
+		cButton:SetScript("OnClick", function() addon.filterSwitch(scriptVal) end)
 	end

-	addon:TooltipDisplay( cButton, ttText, 1 )
+	addon:TooltipDisplay(cButton, ttText, 1)
 end

 function addon:GenericCreateButton(
 	bName, parentFrame,	bHeight, bWidth,
 	anchorFrom, anchorFrame, anchorTo, xOffset, yOffset,
-	bNormFont, bHighFont, initText, tAlign, tooltipText, noTextures )
+	bNormFont, bHighFont, initText, tAlign, tooltipText, noTextures)

 	-- I hate stretchy buttons. Thanks very much to ckknight for this code
 	-- (found in RockConfig)
@@ -561,12 +561,12 @@ function addon:GenericCreateButton(
 		this:EnableMouse(true)
 	end

-	local button = CreateFrame( "Button", bName, parentFrame )
+	local button = CreateFrame("Button", bName, parentFrame)

-	button:SetWidth( bWidth )
-	button:SetHeight( bHeight )
+	button:SetWidth(bWidth)
+	button:SetHeight(bHeight)

-	if ( noTextures == 1 ) then
+	if (noTextures == 1) then
 		local left = button:CreateTexture(button:GetName() .. "_LeftTexture", "BACKGROUND")
 		button.left = left
 		local middle = button:CreateTexture(button:GetName() .. "_MiddleTexture", "BACKGROUND")
@@ -604,12 +604,12 @@ function addon:GenericCreateButton(

 		local highlight = button:CreateTexture(button:GetName() .. "_Highlight", "OVERLAY", "UIPanelButtonHighlightTexture")
 		button:SetHighlightTexture(highlight)
-	elseif ( noTextures == 2 ) then
+	elseif (noTextures == 2) then
 		button:SetNormalTexture("Interface\\Buttons\\UI-PlusButton-Up")
 		button:SetPushedTexture("Interface\\Buttons\\UI-PlusButton-Down")
 		button:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
 		button:SetDisabledTexture("Interface\\Buttons\\UI-PlusButton-Disabled")
-	elseif ( noTextures == 3 ) then
+	elseif (noTextures == 3) then
 		button:SetNormalTexture("Interface\\Buttons\\UI-Panel-MinimizeButton-Up")
 		button:SetPushedTexture("Interface\\Buttons\\UI-Panel-MinimizeButton-Down")
 		button:SetHighlightTexture("Interface\\Buttons\\UI-Panel-MinimizeButton-Hilight")
@@ -621,115 +621,115 @@ function addon:GenericCreateButton(
 	button.text = text
 	text:SetPoint("LEFT", button, "LEFT", 7, 0)
 	text:SetPoint("RIGHT", button, "RIGHT", -7, 0)
-	text:SetJustifyH( tAlign )
+	text:SetJustifyH(tAlign)

 	text:SetFontObject(bNormFont)
 --	text:SetHighlightFontObject(bHighFont)
 --	text:SetDisabledFontObject(GameFontDisableSmall)

-	text:SetText( initText )
+	text:SetText(initText)

-	button:SetPoint( anchorFrom, anchorFrame, anchorTo, xOffset, yOffset )
-	if ( tooltipText ~= "" ) then
-		addon:TooltipDisplay( button, tooltipText )
+	button:SetPoint(anchorFrom, anchorFrame, anchorTo, xOffset, yOffset)
+	if (tooltipText ~= "") then
+		addon:TooltipDisplay(button, tooltipText)
 	end

 	return button
 end

 -- Generic function for creating my expanded panel buttons
-function addon:CreateExpCB( bName, bTex, panelIndex )
+function addon:CreateExpCB(bName, bTex, panelIndex)
 	local ExpTextureSize = 34

-	if ( ( bName == "ARL_RepOldWorldCB" ) or ( bName == "ARL_RepBCCB" ) or ( bName == "ARL_RepLKCB" ) ) then
-		local cButton = CreateFrame( "CheckButton", bName, addon.Fly_Rep ) -- , "UICheckButtonTemplate" )
-			cButton:SetWidth( 100 )
-			cButton:SetHeight( 46 )
-			cButton:SetChecked( false )
+	if ((bName == "ARL_RepOldWorldCB") or (bName == "ARL_RepBCCB") or (bName == "ARL_RepLKCB")) then
+		local cButton = CreateFrame("CheckButton", bName, addon.Fly_Rep) -- , "UICheckButtonTemplate")
+			cButton:SetWidth(100)
+			cButton:SetHeight(46)
+			cButton:SetChecked(false)

-		local iconTex = cButton:CreateTexture( cButton:GetName() .. "buttonTex", "BORDER" )
-			if ( bName == "ARL_RepLKCB" ) then
-				iconTex:SetTexture( "Interface\\Addons\\AckisRecipeList\\img\\" .. bTex )
+		local iconTex = cButton:CreateTexture(cButton:GetName() .. "buttonTex", "BORDER")
+			if (bName == "ARL_RepLKCB") then
+				iconTex:SetTexture("Interface\\Addons\\AckisRecipeList\\img\\" .. bTex)
 			else
-				iconTex:SetTexture( 'Interface/Glues/Common/' .. bTex )
+				iconTex:SetTexture('Interface/Glues/Common/' .. bTex)
 			end
-			iconTex:SetWidth( 100 )
-			iconTex:SetHeight( 46 )
-			iconTex:SetAllPoints( cButton )
-
-		local pushedTexture = cButton:CreateTexture( cButton:GetName() .. "pTex", "ARTWORK" )
-			pushedTexture:SetTexture( 'Interface/Buttons/UI-Quickslot-Depress' )
-			pushedTexture:SetAllPoints( cButton )
-			cButton:SetPushedTexture( pushedTexture )
+			iconTex:SetWidth(100)
+			iconTex:SetHeight(46)
+			iconTex:SetAllPoints(cButton)
+
+		local pushedTexture = cButton:CreateTexture(cButton:GetName() .. "pTex", "ARTWORK")
+			pushedTexture:SetTexture('Interface/Buttons/UI-Quickslot-Depress')
+			pushedTexture:SetAllPoints(cButton)
+			cButton:SetPushedTexture(pushedTexture)
 		local highlightTexture = cButton:CreateTexture()
-			highlightTexture:SetTexture( 'Interface/Buttons/ButtonHilight-Square' )
-			highlightTexture:SetAllPoints( cButton )
-			highlightTexture:SetBlendMode( 'ADD' )
-			cButton:SetHighlightTexture( highlightTexture )
+			highlightTexture:SetTexture('Interface/Buttons/ButtonHilight-Square')
+			highlightTexture:SetAllPoints(cButton)
+			highlightTexture:SetBlendMode('ADD')
+			cButton:SetHighlightTexture(highlightTexture)
 		local checkedTexture = cButton:CreateTexture()
-			checkedTexture:SetTexture( 'Interface/Buttons/CheckButtonHilight' )
-			checkedTexture:SetAllPoints( cButton )
-			checkedTexture:SetBlendMode( 'ADD' )
-			cButton:SetCheckedTexture( checkedTexture )
+			checkedTexture:SetTexture('Interface/Buttons/CheckButtonHilight')
+			checkedTexture:SetAllPoints(cButton)
+			checkedTexture:SetBlendMode('ADD')
+			cButton:SetCheckedTexture(checkedTexture)

 		-- And throw up a tooltip
-		if ( bName == "ARL_RepOldWorldCB" ) then
-			addon:TooltipDisplay( cButton, L["FILTERING_OLDWORLD_DESC"] )
-		elseif ( bName == "ARL_RepBCCB" ) then
-			addon:TooltipDisplay( cButton, L["FILTERING_BC_DESC"] )
+		if (bName == "ARL_RepOldWorldCB") then
+			addon:TooltipDisplay(cButton, L["FILTERING_OLDWORLD_DESC"])
+		elseif (bName == "ARL_RepBCCB") then
+			addon:TooltipDisplay(cButton, L["FILTERING_BC_DESC"])
 		else
-			addon:TooltipDisplay( cButton, L["FILTERING_WOTLK_DESC"] )
+			addon:TooltipDisplay(cButton, L["FILTERING_WOTLK_DESC"])
 		end

 		return cButton
 	else
-		local cButton = CreateFrame( "CheckButton", bName, addon.Frame ) -- , "UICheckButtonTemplate" )
-			cButton:SetWidth( ExpTextureSize )
-			cButton:SetHeight( ExpTextureSize )
-			cButton:SetScript( "OnClick", function()
-				addon.DoFlyaway( panelIndex )
-			end )
-
-		local bgTex = cButton:CreateTexture( cButton:GetName() .. "bgTex", "BACKGROUND" )
-			bgTex:SetTexture( 'Interface/SpellBook/UI-Spellbook-SpellBackground' )
-			bgTex:SetHeight( ExpTextureSize + 6 )
-			bgTex:SetWidth( ExpTextureSize + 4 )
-			bgTex:SetTexCoord( 0, (43/64), 0, (43/64) )
-			bgTex:SetPoint( "CENTER", cButton, "CENTER", 0, 0 )
-		local iconTex = cButton:CreateTexture( cButton:GetName() .. "iconTex", "BORDER" )
-			iconTex:SetTexture( 'Interface/Icons/' .. bTex )
-			iconTex:SetAllPoints( cButton )
-		local pushedTexture = cButton:CreateTexture( cButton:GetName() .. "pTex", "ARTWORK" )
-			pushedTexture:SetTexture( 'Interface/Buttons/UI-Quickslot-Depress' )
-			pushedTexture:SetAllPoints( cButton )
-			cButton:SetPushedTexture( pushedTexture )
+		local cButton = CreateFrame("CheckButton", bName, addon.Frame) -- , "UICheckButtonTemplate")
+			cButton:SetWidth(ExpTextureSize)
+			cButton:SetHeight(ExpTextureSize)
+			cButton:SetScript("OnClick", function()
+				addon.DoFlyaway(panelIndex)
+			end)
+
+		local bgTex = cButton:CreateTexture(cButton:GetName() .. "bgTex", "BACKGROUND")
+			bgTex:SetTexture('Interface/SpellBook/UI-Spellbook-SpellBackground')
+			bgTex:SetHeight(ExpTextureSize + 6)
+			bgTex:SetWidth(ExpTextureSize + 4)
+			bgTex:SetTexCoord(0, (43/64), 0, (43/64))
+			bgTex:SetPoint("CENTER", cButton, "CENTER", 0, 0)
+		local iconTex = cButton:CreateTexture(cButton:GetName() .. "iconTex", "BORDER")
+			iconTex:SetTexture('Interface/Icons/' .. bTex)
+			iconTex:SetAllPoints(cButton)
+		local pushedTexture = cButton:CreateTexture(cButton:GetName() .. "pTex", "ARTWORK")
+			pushedTexture:SetTexture('Interface/Buttons/UI-Quickslot-Depress')
+			pushedTexture:SetAllPoints(cButton)
+			cButton:SetPushedTexture(pushedTexture)
 		local highlightTexture = cButton:CreateTexture()
-			highlightTexture:SetTexture( 'Interface/Buttons/ButtonHilight-Square' )
-			highlightTexture:SetAllPoints( cButton )
-			highlightTexture:SetBlendMode( 'ADD' )
-			cButton:SetHighlightTexture( highlightTexture )
+			highlightTexture:SetTexture('Interface/Buttons/ButtonHilight-Square')
+			highlightTexture:SetAllPoints(cButton)
+			highlightTexture:SetBlendMode('ADD')
+			cButton:SetHighlightTexture(highlightTexture)
 		local checkedTexture = cButton:CreateTexture()
-			checkedTexture:SetTexture( 'Interface/Buttons/CheckButtonHilight' )
-			checkedTexture:SetAllPoints( cButton )
-			checkedTexture:SetBlendMode( 'ADD' )
-			cButton:SetCheckedTexture( checkedTexture )
+			checkedTexture:SetTexture('Interface/Buttons/CheckButtonHilight')
+			checkedTexture:SetAllPoints(cButton)
+			checkedTexture:SetBlendMode('ADD')
+			cButton:SetCheckedTexture(checkedTexture)
 		-- Create the text object to go along with it
-		local cbText = cButton:CreateFontString( "cbText", "OVERLAY", "GameFontHighlight" )
-			cbText:SetText( addon:Yellow( ExpButtonText[panelIndex] ) )
-			cbText:SetPoint( "LEFT", cButton, "RIGHT", 5, 0 )
-			cbText:SetHeight( 14 )
-			cbText:SetWidth( 100 )
-			cbText:SetJustifyH( "LEFT" )
+		local cbText = cButton:CreateFontString("cbText", "OVERLAY", "GameFontHighlight")
+			cbText:SetText(addon:Yellow(ExpButtonText[panelIndex]))
+			cbText:SetPoint("LEFT", cButton, "RIGHT", 5, 0)
+			cbText:SetHeight(14)
+			cbText:SetWidth(100)
+			cbText:SetJustifyH("LEFT")
 			cButton.text = cbText


 		-- Temporary disable on the Item Type Filter until the db can dig that stuff out
-		if ( bName == "ARL_ExpItemOptCB" ) then
-			cbText:SetText( addon:Grey( ExpButtonText[panelIndex] ) )
+		if (bName == "ARL_ExpItemOptCB") then
+			cbText:SetText(addon:Grey(ExpButtonText[panelIndex]))
 		end

 		-- And throw up a tooltip
-		addon:TooltipDisplay( cButton, ExpButtonTT[panelIndex] )
+		addon:TooltipDisplay(cButton, ExpButtonTT[panelIndex])
 		cButton:Hide()
 		return cButton
 	end
@@ -746,87 +746,87 @@ end

 -- Set the texture on the switcher button.

-function SetSwitcherTexture( tex )
+function SetSwitcherTexture(tex)
 -- This is really only called the first time its displayed. It should reflect the first
 -- profession the user has selected, or that shows up in his lists.

 -- For now, just display the first texture
-	local ARL_S_NTexture = ARL_SwitcherButton:CreateTexture( "ARL_S_NTexture", "BACKGROUND" )
-	ARL_S_NTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_up]] )
-	ARL_S_NTexture:SetTexCoord( 0, 1, 0, 1 )
-	ARL_S_NTexture:SetAllPoints( ARL_SwitcherButton )
-	local ARL_S_PTexture = ARL_SwitcherButton:CreateTexture( "ARL_S_PTexture", "BACKGROUND" )
-	ARL_S_PTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_down]] )
-	ARL_S_PTexture:SetTexCoord( 0, 1, 0, 1 )
-	ARL_S_PTexture:SetAllPoints( ARL_SwitcherButton )
-	local ARL_S_DTexture = ARL_SwitcherButton:CreateTexture( "ARL_S_DTexture", "BACKGROUND" )
-	ARL_S_DTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_up]] )
-	ARL_S_DTexture:SetTexCoord( 0, 1, 0, 1 )
-	ARL_S_DTexture:SetAllPoints( ARL_SwitcherButton )
-
-	ARL_SwitcherButton:SetNormalTexture( ARL_S_NTexture )
-	ARL_SwitcherButton:SetPushedTexture( ARL_S_PTexture )
-	ARL_SwitcherButton:SetDisabledTexture( ARL_S_DTexture )
+	local ARL_S_NTexture = ARL_SwitcherButton:CreateTexture("ARL_S_NTexture", "BACKGROUND")
+	ARL_S_NTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_up]])
+	ARL_S_NTexture:SetTexCoord(0, 1, 0, 1)
+	ARL_S_NTexture:SetAllPoints(ARL_SwitcherButton)
+	local ARL_S_PTexture = ARL_SwitcherButton:CreateTexture("ARL_S_PTexture", "BACKGROUND")
+	ARL_S_PTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_down]])
+	ARL_S_PTexture:SetTexCoord(0, 1, 0, 1)
+	ARL_S_PTexture:SetAllPoints(ARL_SwitcherButton)
+	local ARL_S_DTexture = ARL_SwitcherButton:CreateTexture("ARL_S_DTexture", "BACKGROUND")
+	ARL_S_DTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\]] .. tex .. [[_up]])
+	ARL_S_DTexture:SetTexCoord(0, 1, 0, 1)
+	ARL_S_DTexture:SetAllPoints(ARL_SwitcherButton)
+
+	ARL_SwitcherButton:SetNormalTexture(ARL_S_NTexture)
+	ARL_SwitcherButton:SetPushedTexture(ARL_S_PTexture)
+	ARL_SwitcherButton:SetDisabledTexture(ARL_S_DTexture)
 end

 -- converting from hex to rgb (Thanks Maldivia)
 function toRGB(hex)
 	local r, g, b = hex:match("(..)(..)(..)")
-	return ( tonumber(r,16) / 256 ) , ( tonumber(g,16) / 256 ) , ( tonumber(b,16) / 256 )
+	return (tonumber(r,16) / 256) , (tonumber(g,16) / 256) , (tonumber(b,16) / 256)
 end

 -- I want to do a bit more comprehensive tooltip processing. Things like changing font sizes,
 -- adding padding to the left hand side, and using better color handling. So... this function
 -- will do that for me.
-function gttAdd(
+function gttAdd(
 	leftPad,		-- number of times to pad two spaces on left side
 	textSize,		-- negative number. subtract from 12 to get fontsize
 	narrow,			-- if 1, use ARIALN instead of FRITZQ
-	wraptext,		-- wraptext for AddLine ( 0 or 1 )
+	wraptext,		-- wraptext for AddLine (0 or 1)
 	str1,			-- left hand string
 	hexcolor1,		-- hex color code for left hand side
 	str2,			-- if present, this is a double line, and this is the right hand string
-	hexcolor2 )		-- if present, hex color code for right hand side
+	hexcolor2)		-- if present, hex color code for right hand side

 	-- convert hex colors to r g b components. tooltips are dumb that way

-	local a, b, c = toRGB( hexcolor1 )
+	local a, b, c = toRGB(hexcolor1)
 	local d, e, f = 0, 0, 0
-	if ( hexcolor2 ) then d, e, f = toRGB( hexcolor2 ) end
+	if (hexcolor2) then d, e, f = toRGB(hexcolor2) end
 	-- Add in our left hand padding
 	local looppad = leftPad
 	local leftStr = str1
-	while ( looppad > 0 ) do
+	while (looppad > 0) do
 		leftStr = "  " .. leftStr
 		looppad = looppad - 1
 	end
 	-- Are we adding a single or double line?
 	local double = false
-	if ( str2 ) then
-		arlTooltip:AddDoubleLine( leftStr, str2, a, b, c, d, e, f )
+	if (str2) then
+		arlTooltip:AddDoubleLine(leftStr, str2, a, b, c, d, e, f)
 		double = true
 	else
-		arlTooltip:AddLine( leftStr, a, b, c, wraptext )
+		arlTooltip:AddLine(leftStr, a, b, c, wraptext)
 	end
 	-- are we changing fontsize or narrow?
-	if ( ( narrow == 1 ) or ( textSize ~= 0 ) ) then
+	if ((narrow == 1) or (textSize ~= 0)) then
 		local font = "Fonts\\FRIZQT__.TTF"
-		if ( narrow == 1 ) then font = "Fonts\\ARIALN.TTF" end
+		if (narrow == 1) then font = "Fonts\\ARIALN.TTF" end
 		local fontsize = 11
-		if ( textSize ~= 0 ) then fontsize = fontsize + textSize end
+		if (textSize ~= 0) then fontsize = fontsize + textSize end

 		local numlines = arlTooltip:NumLines()
 		local mytext1 = _G[ "arlTooltipTextLeft" .. numlines ]
-		mytext1:SetFont( font, fontsize )
-		if ( double == true ) then
+		mytext1:SetFont(font, fontsize)
+		if (double == true) then
 			local mytext2 = _G[ "arlTooltipTextRight" .. numlines ]
-			mytext2:SetFont( font, fontsize )
+			mytext2:SetFont(font, fontsize)
 		end
 	end
 end

 -- Switch the displayed profession in the main panel
-function addon.SwitchProfs( )
+function addon.SwitchProfs()
 	-- Known professions should be in playerData["Professions"]

 	-- This loop is gonna be weird. The reason is because we need to
@@ -843,7 +843,7 @@ function addon.SwitchProfs( )

 	-- ok, so first off, if we've never done this before, there is no "current"
 	-- and a single iteration will do nicely, thank you
-	if ( currentProfIndex == 0 ) then
+	if (currentProfIndex == 0) then
 		startLoop = 1
 		endLoop = addon.MaxProfessions + 1
 	else
@@ -851,11 +851,11 @@ function addon.SwitchProfs( )
 		endLoop = currentProfIndex
 	end
 	local index = startLoop
-	while ( index ~= endLoop ) do
-		if ( index > MaxProfessions ) then
+	while (index ~= endLoop) do
+		if (index > MaxProfessions) then
 			index = 1
 		else
-			if ( playerData["Professions"][SortedProfessions[index].name] == true ) then
+			if (playerData["Professions"][SortedProfessions[index].name] == true) then
 				displayProf = index
 				currentProfIndex = index
 				break
@@ -865,22 +865,22 @@ function addon.SwitchProfs( )
 		end
 	end
 	-- Redisplay the button with the new skill
-	SetSwitcherTexture( SortedProfessions[currentProfIndex].texture )
+	SetSwitcherTexture(SortedProfessions[currentProfIndex].texture)
 	playerData.playerProfession = SortedProfessions[currentProfIndex].name
 	ReDisplay()
 end

-function ClearRecipeButtonTooltip( bIndex )
+function ClearRecipeButtonTooltip(bIndex)
 	local pButton = addon.PlusListButton[bIndex]
 	local rButton = addon.RecipeListButton[bIndex]
-	pButton:SetScript( "OnEnter", function () end )
-	pButton:SetScript( "OnLeave", function () end )
-	rButton:SetScript( "OnEnter", function () end )
-	rButton:SetScript( "OnLeave", function () end )
+	pButton:SetScript("OnEnter", function () end)
+	pButton:SetScript("OnLeave", function () end)
+	rButton:SetScript("OnEnter", function () end)
+	rButton:SetScript("OnLeave", function () end)
 end

 -- This sets the tooltip on the button during a recipelist update
-function SetRecipeButtonTooltip ( bIndex )
+function SetRecipeButtonTooltip (bIndex)

 	local exclude = addon.db.profile.exclusionlist
 	local pButton = addon.PlusListButton[bIndex]
@@ -888,374 +888,446 @@ function SetRecipeButtonTooltip ( bIndex )
 	local dStringIndex = rButton.sI
 	local rIndex = DisplayStrings[dStringIndex].sID
 	local clr1, clr2 = "", ""
-	pButton:SetScript( "OnEnter",
-		function ( pButton )
+
+	pButton:SetScript("OnEnter",
+		function (pButton)
 			arlTooltip:ClearLines()
-			arlTooltip:SetOwner( pButton, "ANCHOR_RIGHT" )
-			gttAdd( 0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor( "HIGH" ) )
+			arlTooltip:SetOwner(pButton, "ANCHOR_RIGHT")
+			gttAdd(0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor("HIGH"))
+
 			-- check if the recipe is excluded
-			if ( exclude[rIndex] == true ) then
-				clr1 = addon:hexcolor( "RED" )
-				gttAdd( 0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1 )
+			if (exclude[rIndex] == true) then
+				clr1 = addon:hexcolor("RED")
+				gttAdd(0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1)
 			end
+
 			-- Add in skill level requirement, colored correctly
-			clr1 = addon:hexcolor( "NORMAL" )
+			clr1 = addon:hexcolor("NORMAL")
+
 			local recipeSkill = recipeDB[rIndex]["Level"]
 			local playerSkill = playerData.playerProfessionLevel
+
 			if (recipeSkill > playerSkill) then
 				clr2 = addon:hexcolor("RED")
-			elseif ( ( playerSkill - recipeSkill ) < 20 ) then
-				clr2 = addon:hexcolor( "ORANGE" )
-			elseif ( ( playerSkill - recipeSkill ) < 30 ) then
-				clr2 = addon:hexcolor( "YELLOW" )
-			elseif ( ( playerSkill - recipeSkill ) < 40 ) then
-				clr2 = addon:hexcolor( "GREEN" )
+			elseif ((playerSkill - recipeSkill) < 20) then
+				clr2 = addon:hexcolor("ORANGE")
+			elseif ((playerSkill - recipeSkill) < 30) then
+				clr2 = addon:hexcolor("YELLOW")
+			elseif ((playerSkill - recipeSkill) < 40) then
+				clr2 = addon:hexcolor("GREEN")
 			else
-				clr2 = addon:hexcolor( "MIDGREY" )
+				clr2 = addon:hexcolor("MIDGREY")
 			end
-			gttAdd( 0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2 )
+
+			gttAdd(0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2)
 			-- spacer
-			gttAdd( 0, 0, 0, 0, ".", addon:hexcolor( "BLACK" ) )
+			gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
 			-- obtain info
-			gttAdd( 0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor( "NORMAL" ) )
-				-- loop through acquire methods, display each
-				for k, v in pairs( recipeDB[rIndex]["Acquire"]) do
-					-- Trainer
-					if (v["Type"] == 1) then
+			gttAdd(0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor("NORMAL"))
+
+			-- loop through acquire methods, display each
+			for k, v in pairs(recipeDB[rIndex]["Acquire"]) do
+
+				-- Trainer
+				if (v["Type"] == 1) then
+
+					-- Trainer:				TrainerName
+					-- TrainerZone			TrainerCoords
+					local trnr = trainerDB[v["ID"]]
+					local cStr = ""
+
+					if (trnr["Coordx"] ~= "0") and (trnr["Coordy"] ~= "0") then
+
+						cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
+
+					end
+
+					clr1 = addon:hexcolor("TRAINER")
+
+					if (trnr["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (trnr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
+
+					gttAdd(0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2)
+
+				-- Vendor
+				elseif (v["Type"] == 2) then
+
+					-- Vendor:					VendorName
+					-- VendorZone				VendorCoords
+					local vndr = vendorDB[v["ID"]]
+					local cStr = ""
+
+					if (vndr["Coordx"] ~= "0") and (vndr["Coordy"] ~= "0") then
+
+						cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
+
+					end
+
+					clr1 = addon:hexcolor("VENDOR")
+
+					if (vndr["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (vndr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
+
+					gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
+
+				-- Mob Drop
+				elseif (v["Type"] == 3) then
+
+					-- Mob Drop:				Mob Name
+					-- MobZone					MobCoords
+					local mob = mobDB[v["ID"]]
+					local cStr = ""
+
+					if (mob["Coordx"] ~= "0") and (mob["Coordy"] ~= "0") then
+
+						cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
+
+					end
+
+					clr1 = addon:hexcolor("MOBDROP")
+					clr2 = addon:hexcolor("HORDE")
+					gttAdd(0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, mob["Location"], clr1, cStr, clr2)
+
+				-- Quest
+				elseif (v["Type"] == 4) then
+
+					-- Quest:					QuestName
+					-- QuestZone				QuestCoords
+					local qst = questDB[v["ID"]]
+
+					if (qst ~= nil) then

-						-- Trainer:				TrainerName
-						-- TrainerZone			TrainerCoords
-						local trnr = trainerDB[v["ID"]]
 						local cStr = ""

-						if (trnr["Coordx"] ~= "0") and (trnr["Coordy"] ~= "0") then
-							cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
-						end
+						if (qst["Coordx"] ~= "0") and (qst["Coordy"] ~= "0") then
+
+							cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"

-						clr1 = addon:hexcolor( "TRAINER" )
-						if (trnr["Faction"] == BFAC["Horde"]) then
-							clr2 = addon:hexcolor( "HORDE" )
-						elseif ( trnr["Faction"] == BFAC["Alliance"] ) then
-							clr2 = addon:hexcolor( "ALLIANCE" )
-						else
-							clr2 = addon:hexcolor( "NEUTRAL" )
 						end
-						gttAdd( 0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2 )
-					-- Vendor
-					elseif ( v["Type"] == 2 ) then
-						-- Vendor:					VendorName
-						-- VendorZone				VendorCoords
-						local vndr = vendorDB[v["ID"]]
-						local cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
-						clr1 = addon:hexcolor("VENDOR")
-						if (vndr["Faction"] == BFAC["Horde"]) then
+
+						clr1 = addon:hexcolor("QUEST")
+
+						if (qst["Faction"] == BFAC["Horde"]) then
 							clr2 = addon:hexcolor("HORDE")
-						elseif (vndr["Faction"] == BFAC["Alliance"]) then
+						elseif (qst["Faction"] == BFAC["Alliance"]) then
 							clr2 = addon:hexcolor("ALLIANCE")
 						else
 							clr2 = addon:hexcolor("NEUTRAL")
 						end
-						gttAdd( 0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2 )
-					-- Mob Drop
-					elseif ( v["Type"] == 3 ) then
-						-- Mob Drop:				Mob Name
-						-- MobZone					MobCoords
-						local mob = mobDB[v["ID"]]
-						local cStr = ""

-						if (mob["Coordx"] ~= "0") and (mob["Coordy"] ~= "0") then
+						gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
+						clr1 = addon:hexcolor("NORMAL")
+						clr2 = addon:hexcolor("HIGH")
+						gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)

-							cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
+					end

-						end
+				-- Seasonal
+				elseif (v["Type"] == 5) then
+
+					-- Seasonal:				SeasonEventName
+					local ssnname = seasonDB[v["ID"]]["Name"]
+
+					clr1 = addon:hexcolor("SEASON")
+					gttAdd(0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1)
+
+				-- Reputation
+				elseif (v["Type"] == 6) then
+
+					-- Reputation:				Faction
+					-- FactionLevel				RepVendor
+					-- RepVendorZone			RepVendorCoords
+
+					local repfac = repDB[v["ID"]]
+					local repname = repfac["Name"] -- name
+					local rplvl = v["RepLevel"]
+					local repvndr = vendorDB[v["RepVendor"]]
+					local cStr = ""
+
+					if (repvndr["Coordx"] ~= "0") and (repvndr["Coordy"] ~= "0") then
+
+						cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"

-						clr1 = addon:hexcolor("MOBDROP")
+					end
+
+					clr1 = addon:hexcolor("REP")
+					clr2 = addon:hexcolor("NORMAL")
+					gttAdd(0, -1, 0, 0, L["Reputation"], clr1, repname, clr2)
+
+					local rStr = ""
+					if (rplvl == 0) then
+						rStr = BFAC["Neutral"]
+						clr1 = addon:hexcolor("NEUTRAL")
+					elseif (rplvl == 1) then
+						rStr = BFAC["Neutral"]
+						clr1 = addon:hexcolor("FRIENDLY")
+					elseif (rplvl == 2) then
+						rStr = BFAC["Honored"]
+						clr1 = addon:hexcolor("HONORED")
+					elseif (rplvl == 3) then
+						rStr = BFAC["Revered"]
+						clr1 = addon:hexcolor("REVERED")
+					else
+						rStr = BFAC["Exalted"]
+						clr1 = addon:hexcolor("EXALTED")
+					end
+
+					if (repvndr["Faction"] == BFAC["Horde"]) then
 						clr2 = addon:hexcolor("HORDE")
-						gttAdd( 0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, mob["Location"], clr1, cStr, clr2 )
-					-- Quest
-					elseif ( v["Type"] == 4 ) then
-						-- Quest:					QuestName
-						-- QuestZone				QuestCoords
-						local qst = questDB[v["ID"]]
-						if ( qst ~= nil ) then
-							local cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
-							clr1 = addon:hexcolor( "QUEST" )
-							if ( qst["Faction"] == BFAC["Horde"] ) then
-								clr2 = addon:hexcolor( "HORDE" )
-							elseif ( qst["Faction"] == BFAC["Alliance"] ) then
-								clr2 = addon:hexcolor( "ALLIANCE" )
-							else
-								clr2 = addon:hexcolor( "NEUTRAL" )
-							end
-							gttAdd( 0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2 )
-							clr1 = addon:hexcolor( "NORMAL" )
-							clr2 = addon:hexcolor( "HIGH" )
-							gttAdd( 1, -2, 1, 0, qst["Location"], clr1, cStr, clr2 )
-						end
-					-- Seasonal
-					elseif ( v["Type"] == 5 ) then
-						-- Seasonal:				SeasonEventName
-						local ssnname = seasonDB[v["ID"]]["Name"]
-						clr1 = addon:hexcolor( "SEASON" )
-						gttAdd( 0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1 )
-					elseif ( v["Type"] == 6 ) then			-- Reputation
-						-- Reputation:				Faction
-						-- FactionLevel				RepVendor
-						-- RepVendorZone			RepVendorCoords
-						local repfac = repDB[v["ID"]]
-						local repname = repfac["Name"] -- name
-						local rplvl = v["RepLevel"]
-						local repvndr = vendorDB[v["RepVendor"]]
-						local cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"
-
-						clr1 = addon:hexcolor( "REP" )
-						clr2 = addon:hexcolor( "NORMAL" )
-						gttAdd( 0, -1, 0, 0, L["Reputation"], clr1, repname, clr2 )
-
-						local rStr = ""
-						if ( rplvl == 0 ) then
-							rStr = BFAC["Neutral"]
-							clr1 = addon:hexcolor( "NEUTRAL" )
-						elseif ( rplvl == 1 ) then
-							rStr = BFAC["Neutral"]
-							clr1 = addon:hexcolor( "FRIENDLY" )
-						elseif ( rplvl == 2 ) then
-							rStr = BFAC["Honored"]
-							clr1 = addon:hexcolor( "HONORED" )
-						elseif ( rplvl == 3 ) then
-							rStr = BFAC["Revered"]
-							clr1 = addon:hexcolor( "REVERED" )
-						else
-							rStr = BFAC["Exalted"]
-							clr1 = addon:hexcolor( "EXALTED" )
-						end
-						if ( repvndr["Faction"] == BFAC["Horde"] ) then
-							clr2 = addon:hexcolor( "HORDE" )
-						elseif ( repvndr["Faction"] == BFAC["Alliance"] ) then
-							clr2 = addon:hexcolor( "ALLIANCE" )
-						else
-							clr2 = addon:hexcolor( "NEUTRAL" )
-						end
-						gttAdd( 1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2 )
-					elseif ( v["Type"] == 7 ) then			-- World Drop
-						-- World Drop				RarityLevel
-						if ( v["ID"] == 1 ) then
-							clr1 = addon:hexcolor( "COMMON" )
-						elseif ( v["ID"] == 2 ) then
-							clr1 = addon:hexcolor( "UNCOMMON" )
-						elseif ( v["ID"] == 3 ) then
-							clr1 = addon:hexcolor( "RARE" )
-						elseif ( v["ID"] == 4 ) then
-							clr1 = addon:hexcolor( "EPIC" )
-						else
-							clr1 = addon:hexcolor( "NORMAL" )
-						end
-						gttAdd( 0, -1, 0, 0, L["World Drop"], clr1 )
-					else									-- Unhandled
-						clr1 = addon:hexcolor( "NORMAL" )
-						gttAdd( 0, -1, 0, 0, L["Unhandled Recipe"], clr1 )
+					elseif (repvndr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
 					end
+
+					gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+
+				-- World Drop
+				elseif (v["Type"] == 7) then
+
+					-- World Drop				RarityLevel
+					if (v["ID"] == 1) then
+						clr1 = addon:hexcolor("COMMON")
+					elseif (v["ID"] == 2) then
+						clr1 = addon:hexcolor("UNCOMMON")
+					elseif (v["ID"] == 3) then
+						clr1 = addon:hexcolor("RARE")
+					elseif (v["ID"] == 4) then
+						clr1 = addon:hexcolor("EPIC")
+					else
+						clr1 = addon:hexcolor("NORMAL")
+					end
+
+					gttAdd(0, -1, 0, 0, L["World Drop"], clr1)
+
+				-- Unhandled
+				else
+
+					clr1 = addon:hexcolor("NORMAL")
+					gttAdd(0, -1, 0, 0, L["Unhandled Recipe"], clr1)
+
 				end
-				gttAdd( 0, 0, 0, 0, ".", addon:hexcolor( "BLACK" ) )
-				clr1 = addon:hexcolor( "NORMAL" )
-				gttAdd( 0, -1, 0, 0, L["ALT_CLICK"], clr1 )
-				gttAdd( 0, -1, 0, 1, L["CTRL_CLICK"], clr1 )
-				gttAdd( 0, -1, 0, 1, L["SHIFT_CLICK"], clr1 )
+
+			end
+
+			gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
+			clr1 = addon:hexcolor("NORMAL")
+			gttAdd(0, -1, 0, 0, L["ALT_CLICK"], clr1)
+			gttAdd(0, -1, 0, 1, L["CTRL_CLICK"], clr1)
+			gttAdd(0, -1, 0, 1, L["SHIFT_CLICK"], clr1)
 			arlTooltip:Show()
+
 		end
-	)
-	pButton:SetScript( "OnLeave",
-		function( )
+		)
+
+	pButton:SetScript("OnLeave",
+		function()
 			arlTooltip:Hide()
 		end
-	)
-	rButton:SetScript( "OnEnter",
-		function ( rButton )
+		)
+
+	rButton:SetScript("OnEnter",
+		function (rButton)
 			arlTooltip:ClearLines()
-			arlTooltip:SetOwner( rButton, "ANCHOR_RIGHT" )
-			gttAdd( 0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor( "HIGH" ) )
+			arlTooltip:SetOwner(rButton, "ANCHOR_RIGHT")
+			gttAdd(0, 1, 0, 0, recipeDB[rIndex]["Name"], addon:hexcolor("HIGH"))
 			-- check if the recipe is excluded
-			if ( exclude[rIndex] == true ) then
-				clr1 = addon:hexcolor( "HORDE" )
-				gttAdd( 0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1 )
+			if (exclude[rIndex] == true) then
+				clr1 = addon:hexcolor("HORDE")
+				gttAdd(0, -1, 1, 0, L["RECIPE_EXCLUDED"], clr1)
 			end
 			-- Add in skill level requirement, colored correctly
-			clr1 = addon:hexcolor( "NORMAL" )
+			clr1 = addon:hexcolor("NORMAL")
 			local recipeSkill = recipeDB[rIndex]["Level"]
 			local playerSkill = playerData.playerProfessionLevel
-			if ( recipeSkill > playerSkill ) then
-				clr2 = addon:hexcolor( "HORDE" )
-			elseif ( ( playerSkill - recipeSkill ) < 20 ) then
-				clr2 = addon:hexcolor( "ORANGE" )
-			elseif ( ( playerSkill - recipeSkill ) < 30 ) then
-				clr2 = addon:hexcolor( "YELLOW" )
-			elseif ( ( playerSkill - recipeSkill ) < 40 ) then
-				clr2 = addon:hexcolor( "GREEN" )
+			if (recipeSkill > playerSkill) then
+				clr2 = addon:hexcolor("HORDE")
+			elseif ((playerSkill - recipeSkill) < 20) then
+				clr2 = addon:hexcolor("ORANGE")
+			elseif ((playerSkill - recipeSkill) < 30) then
+				clr2 = addon:hexcolor("YELLOW")
+			elseif ((playerSkill - recipeSkill) < 40) then
+				clr2 = addon:hexcolor("GREEN")
 			else
-				clr2 = addon:hexcolor( "MIDGREY" )
+				clr2 = addon:hexcolor("MIDGREY")
 			end
-			gttAdd( 0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2 )
+			gttAdd(0, -1, 0, 0, L["Required Skill"] .. " :", clr1, recipeDB[rIndex]["Level"], clr2)
 			-- spacer
-			gttAdd( 0, 0, 0, 0, ".", addon:hexcolor( "BLACK" ) )
+			gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
 			-- obtain info
-			gttAdd( 0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor( "NORMAL" ) )
+			gttAdd(0, -1, 0, 0, L["Obtained From"] .. " : ", addon:hexcolor("NORMAL"))
 				-- loop through acquire methods, display each
-				for k, v in pairs( recipeDB[rIndex]["Acquire"]) do
-					if ( v["Type"] == 1 ) then				-- Trainer
-						-- Trainer:				TrainerName
-						-- TrainerZone			TrainerCoords
-						local trnr = trainerDB[v["ID"]]
-						local cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
-						clr1 = addon:hexcolor( "TRAINER" )
-						if ( trnr["Faction"] == BFAC["Horde"] ) then
-							clr2 = addon:hexcolor( "HORDE" )
-						elseif ( trnr["Faction"] == BFAC["Alliance"] ) then
-							clr2 = addon:hexcolor( "ALLIANCE" )
-						else
-							clr2 = addon:hexcolor( "NEUTRAL" )
-						end
-						gttAdd( 0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2 )
-					elseif ( v["Type"] == 2 ) then			-- Vendor
-						-- Vendor:					VendorName
-						-- VendorZone				VendorCoords
-						local vndr = vendorDB[v["ID"]]
-						local cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
-						clr1 = addon:hexcolor( "VENDOR" )
-						if ( vndr["Faction"] == BFAC["Horde"] ) then
-							clr2 = addon:hexcolor( "HORDE" )
-						elseif ( vndr["Faction"] == BFAC["Alliance"] ) then
-							clr2 = addon:hexcolor( "ALLIANCE" )
-						else
-							clr2 = addon:hexcolor( "NEUTRAL" )
-						end
-						gttAdd( 0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2 )
-					elseif ( v["Type"] == 3 ) then			-- Mob Drop
-						-- Mob Drop:				Mob Name
-						-- MobZone					MobCoords
-						local mob = mobDB[v["ID"]]
-						local cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
-						clr1 = addon:hexcolor( "MOBDROP" )
-						clr2 = addon:hexcolor( "HORDE" )
-						gttAdd( 0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 1, -2, 1, 0, mob["Location"], clr1, cStr, clr2 )
-					elseif ( v["Type"] == 4 ) then			-- Quest
-						-- Quest:					QuestName
-						-- QuestZone				QuestCoords
-						local qst = questDB[v["ID"]]
-						if ( qst ~= nil ) then
-							local cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
-							clr1 = addon:hexcolor( "QUEST" )
-							if ( qst["Faction"] == BFAC["Horde"] ) then
-								clr2 = addon:hexcolor( "HORDE" )
-							elseif ( qst["Faction"] == BFAC["Alliance"] ) then
-								clr2 = addon:hexcolor( "ALLIANCE" )
-							else
-								clr2 = addon:hexcolor( "NEUTRAL" )
-							end
-							gttAdd( 0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2 )
-							clr1 = addon:hexcolor( "NORMAL" )
-							clr2 = addon:hexcolor( "HIGH" )
-							gttAdd( 1, -2, 1, 0, qst["Location"], clr1, cStr, clr2 )
-						end
-					elseif ( v["Type"] == 5 ) then			-- Seasonal
-						-- Seasonal:				SeasonEventName
-						local ssnname = seasonDB[v["ID"]]["Name"]
-						clr1 = addon:hexcolor( "SEASON" )
-						gttAdd( 0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1 )
-					elseif ( v["Type"] == 6 ) then			-- Reputation
-						-- Reputation:				Faction
-						-- FactionLevel				RepVendor
-						-- RepVendorZone			RepVendorCoords
-						local repfac = repDB[v["ID"]]
-						local repname = repfac["Name"] -- name
-						local rplvl = v["RepLevel"]
-						local repvndr = vendorDB[v["RepVendor"]]
-						local cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"
-
-						clr1 = addon:hexcolor( "REP" )
-						clr2 = addon:hexcolor( "NORMAL" )
-						gttAdd( 0, -1, 0, 0, L["Reputation"], clr1, repname, clr2 )
-
-						local rStr = ""
-						if ( rplvl == 0 ) then
-							rStr = BFAC["Neutral"]
-							clr1 = addon:hexcolor( "NEUTRAL" )
-						elseif ( rplvl == 1 ) then
-							rStr = BFAC["Neutral"]
-							clr1 = addon:hexcolor( "FRIENDLY" )
-						elseif ( rplvl == 2 ) then
-							rStr = BFAC["Honored"]
-							clr1 = addon:hexcolor( "HONORED" )
-						elseif ( rplvl == 3 ) then
-							rStr = BFAC["Revered"]
-							clr1 = addon:hexcolor( "REVERED" )
-						else
-							rStr = BFAC["Exalted"]
-							clr1 = addon:hexcolor( "EXALTED" )
-						end
-						if ( repvndr["Faction"] == BFAC["Horde"] ) then
-							clr2 = addon:hexcolor( "HORDE" )
-						elseif ( repvndr["Faction"] == BFAC["Alliance"] ) then
-							clr2 = addon:hexcolor( "ALLIANCE" )
-						else
-							clr2 = addon:hexcolor( "NEUTRAL" )
-						end
-						gttAdd( 1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2 )
-						clr1 = addon:hexcolor( "NORMAL" )
-						clr2 = addon:hexcolor( "HIGH" )
-						gttAdd( 2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2 )
-					elseif ( v["Type"] == 7 ) then			-- World Drop
-						-- World Drop				RarityLevel
-						if ( v["ID"] == 1 ) then
-							clr1 = addon:hexcolor( "COMMON" )
-						elseif ( v["ID"] == 2 ) then
-							clr1 = addon:hexcolor( "UNCOMMON" )
-						elseif ( v["ID"] == 3 ) then
-							clr1 = addon:hexcolor( "RARE" )
-						elseif ( v["ID"] == 4 ) then
-							clr1 = addon:hexcolor( "EPIC" )
+			for k, v in pairs(recipeDB[rIndex]["Acquire"]) do
+				if (v["Type"] == 1) then				-- Trainer
+					-- Trainer:				TrainerName
+					-- TrainerZone			TrainerCoords
+					local trnr = trainerDB[v["ID"]]
+					local cStr = "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")"
+					clr1 = addon:hexcolor("TRAINER")
+					if (trnr["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (trnr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
+					gttAdd(0, -2, 0, 0, L["Trainer"], clr1, trnr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, trnr["Location"], clr1, cStr, clr2)
+				elseif (v["Type"] == 2) then			-- Vendor
+					-- Vendor:					VendorName
+					-- VendorZone				VendorCoords
+					local vndr = vendorDB[v["ID"]]
+					local cStr = "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")"
+					clr1 = addon:hexcolor("VENDOR")
+					if (vndr["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (vndr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
+					gttAdd(0, -1, 0, 0, L["Vendor"], clr1, vndr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, vndr["Location"], clr1, cStr, clr2)
+				elseif (v["Type"] == 3) then			-- Mob Drop
+					-- Mob Drop:				Mob Name
+					-- MobZone					MobCoords
+					local mob = mobDB[v["ID"]]
+					local cStr = "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")"
+					clr1 = addon:hexcolor("MOBDROP")
+					clr2 = addon:hexcolor("HORDE")
+					gttAdd(0, -1, 0, 0, L["Mob Drop"], clr1, mob["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(1, -2, 1, 0, mob["Location"], clr1, cStr, clr2)
+				elseif (v["Type"] == 4) then			-- Quest
+					-- Quest:					QuestName
+					-- QuestZone				QuestCoords
+					local qst = questDB[v["ID"]]
+					if (qst ~= nil) then
+						local cStr = "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")"
+						clr1 = addon:hexcolor("QUEST")
+						if (qst["Faction"] == BFAC["Horde"]) then
+							clr2 = addon:hexcolor("HORDE")
+						elseif (qst["Faction"] == BFAC["Alliance"]) then
+							clr2 = addon:hexcolor("ALLIANCE")
 						else
-							clr1 = addon:hexcolor( "NORMAL" )
+							clr2 = addon:hexcolor("NEUTRAL")
 						end
-						gttAdd( 0, -1, 0, 0, L["World Drop"], clr1 )
-					else									-- Unhandled
-						clr1 = addon:hexcolor( "NORMAL" )
-						gttAdd( 0, -1, 0, 0, L["Unhandled Recipe"], clr1 )
+						gttAdd(0, -1, 0, 0, L["Quest"], clr1, qst["Name"], clr2)
+						clr1 = addon:hexcolor("NORMAL")
+						clr2 = addon:hexcolor("HIGH")
+						gttAdd(1, -2, 1, 0, qst["Location"], clr1, cStr, clr2)
 					end
+				elseif (v["Type"] == 5) then			-- Seasonal
+					-- Seasonal:				SeasonEventName
+					local ssnname = seasonDB[v["ID"]]["Name"]
+					clr1 = addon:hexcolor("SEASON")
+					gttAdd(0, -1, 0, 0, L["Seasonal"], clr1, ssnname, clr1)
+				elseif (v["Type"] == 6) then			-- Reputation
+					-- Reputation:				Faction
+					-- FactionLevel				RepVendor
+					-- RepVendorZone			RepVendorCoords
+					local repfac = repDB[v["ID"]]
+					local repname = repfac["Name"] -- name
+					local rplvl = v["RepLevel"]
+					local repvndr = vendorDB[v["RepVendor"]]
+					local cStr = "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")"
+
+					clr1 = addon:hexcolor("REP")
+					clr2 = addon:hexcolor("NORMAL")
+					gttAdd(0, -1, 0, 0, L["Reputation"], clr1, repname, clr2)
+
+					local rStr = ""
+					if (rplvl == 0) then
+						rStr = BFAC["Neutral"]
+						clr1 = addon:hexcolor("NEUTRAL")
+					elseif (rplvl == 1) then
+						rStr = BFAC["Neutral"]
+						clr1 = addon:hexcolor("FRIENDLY")
+					elseif (rplvl == 2) then
+						rStr = BFAC["Honored"]
+						clr1 = addon:hexcolor("HONORED")
+					elseif (rplvl == 3) then
+						rStr = BFAC["Revered"]
+						clr1 = addon:hexcolor("REVERED")
+					else
+						rStr = BFAC["Exalted"]
+						clr1 = addon:hexcolor("EXALTED")
+					end
+					if (repvndr["Faction"] == BFAC["Horde"]) then
+						clr2 = addon:hexcolor("HORDE")
+					elseif (repvndr["Faction"] == BFAC["Alliance"]) then
+						clr2 = addon:hexcolor("ALLIANCE")
+					else
+						clr2 = addon:hexcolor("NEUTRAL")
+					end
+					gttAdd(1, -2, 0, 0, rStr, clr1, repvndr["Name"], clr2)
+					clr1 = addon:hexcolor("NORMAL")
+					clr2 = addon:hexcolor("HIGH")
+					gttAdd(2, -2, 1, 0, repvndr["Location"], clr1, cStr, clr2)
+				elseif (v["Type"] == 7) then			-- World Drop
+					-- World Drop				RarityLevel
+					if (v["ID"] == 1) then
+						clr1 = addon:hexcolor("COMMON")
+					elseif (v["ID"] == 2) then
+						clr1 = addon:hexcolor("UNCOMMON")
+					elseif (v["ID"] == 3) then
+						clr1 = addon:hexcolor("RARE")
+					elseif (v["ID"] == 4) then
+						clr1 = addon:hexcolor("EPIC")
+					else
+						clr1 = addon:hexcolor("NORMAL")
+					end
+					gttAdd(0, -1, 0, 0, L["World Drop"], clr1)
+				-- Unhandled
+				else
+					clr1 = addon:hexcolor("NORMAL")
+					gttAdd(0, -1, 0, 0, L["Unhandled Recipe"], clr1)
 				end
-				gttAdd( 0, 0, 0, 0, ".", addon:hexcolor( "BLACK" ) )
-				clr1 = addon:hexcolor( "NORMAL" )
-				gttAdd( 0, -1, 0, 0, L["ALT_CLICK"], clr1 )
-				gttAdd( 0, -1, 0, 1, L["CTRL_CLICK"], clr1 )
-				gttAdd( 0, -1, 0, 1, L["SHIFT_CLICK"], clr1 )
+			end
+
+			gttAdd(0, 0, 0, 0, ".", addon:hexcolor("BLACK"))
+			clr1 = addon:hexcolor("NORMAL")
+			gttAdd(0, -1, 0, 0, L["ALT_CLICK"], clr1)
+			gttAdd(0, -1, 0, 1, L["CTRL_CLICK"], clr1)
+			gttAdd(0, -1, 0, 1, L["SHIFT_CLICK"], clr1)
 			arlTooltip:Show()
+
 		end
 	)
-	rButton:SetScript( "OnLeave",
-		function( )
+
+	rButton:SetScript("OnLeave",
+		function()
 			arlTooltip:Hide()
 		end
 	)
+
 end

 -- Scrollframe update stuff
@@ -1263,32 +1335,32 @@ function RecipeList_Update()

 	-- Clear out the current buttons
 	for i = 1, maxVisibleRecipes do
-		addon.RecipeListButton[i]:SetText( "" )
+		addon.RecipeListButton[i]:SetText("")
 		addon.RecipeListButton[i].sI = 0
 		addon.PlusListButton[i]:Hide()
-		ClearRecipeButtonTooltip( i )
+		ClearRecipeButtonTooltip(i)
 	end

 	local entries = #DisplayStrings

-	FauxScrollFrame_Update( ARL_RecipeScrollFrame, entries, maxVisibleRecipes, 16 )
+	FauxScrollFrame_Update(ARL_RecipeScrollFrame, entries, maxVisibleRecipes, 16)

 	if (entries > 0) then
 		-- now fill in our buttons
-		local listOffset = FauxScrollFrame_GetOffset( ARL_RecipeScrollFrame )
-		-- addon.Print( "listOffset = " .. listOffset)
+		local listOffset = FauxScrollFrame_GetOffset(ARL_RecipeScrollFrame)
+		-- addon.Print("listOffset = " .. listOffset)
 		local buttonIndex = 1
 		local stringsIndex = buttonIndex + listOffset

 		local stayInLoop = true
-		while ( stayInLoop == true ) do
-			-- addon.Print( "buttonIndex/stringsIndex = " .. buttonIndex .. "/" .. stringsIndex )
+		while (stayInLoop == true) do
+			-- addon.Print("buttonIndex/stringsIndex = " .. buttonIndex .. "/" .. stringsIndex)
 			-- addon.PlusListButton = {},  addon.RecipeListButton = {}
-			if ( DisplayStrings[stringsIndex].IsRecipe ) then
+			if (DisplayStrings[stringsIndex].IsRecipe) then
 				-- display the + symbol
 				addon.PlusListButton[buttonIndex]:Show()
 				-- Is it expanded or not?
-				if ( DisplayStrings[stringsIndex].IsExpanded ) then
+				if (DisplayStrings[stringsIndex].IsExpanded) then
 					addon.PlusListButton[buttonIndex]:SetNormalTexture("Interface\\Buttons\\UI-MinusButton-Up")
 					addon.PlusListButton[buttonIndex]:SetPushedTexture("Interface\\Buttons\\UI-MinusButton-Down")
 					addon.PlusListButton[buttonIndex]:SetHighlightTexture("Interface\\Buttons\\UI-PlusButton-Hilight")
@@ -1302,16 +1374,16 @@ function RecipeList_Update()
 			else
 				addon.PlusListButton[buttonIndex]:Hide()
 			end
-			addon.RecipeListButton[buttonIndex]:SetText( DisplayStrings[stringsIndex].String )
+			addon.RecipeListButton[buttonIndex]:SetText(DisplayStrings[stringsIndex].String)
 			addon.RecipeListButton[buttonIndex].sI = stringsIndex

 			-- Set the tooltip on the button
-			SetRecipeButtonTooltip( buttonIndex )
+			SetRecipeButtonTooltip(buttonIndex)

 			buttonIndex = buttonIndex + 1
 			stringsIndex = stringsIndex + 1
-			if ( ( buttonIndex > maxVisibleRecipes ) or
-				 ( stringsIndex > entries ) ) then
+			if ((buttonIndex > maxVisibleRecipes) or
+				 (stringsIndex > entries)) then
 				stayInLoop = false
 			end
 		end
@@ -1325,7 +1397,7 @@ function RecipeList_Update()
 	end
 end

-function expandEntry( dsIndex )
+function expandEntry(dsIndex)
 	-- insertIndex is the position in DisplayStrings that we want
 	-- to expand. Since we are expanding the current entry, the return
 	-- value should be the index of the next button after the expansion
@@ -1336,154 +1408,154 @@ function expandEntry( dsIndex )
 	dsIndex = dsIndex + 1

 	-- Need to loop through the available acquires and put them all in
-	for k, v in pairs( recipeDB[recipeIndex]["Acquire"] ) do
+	for k, v in pairs(recipeDB[recipeIndex]["Acquire"]) do
 		local pad = "  "
 		-- set the string based on type of acquire
 		--[[ 1 = Trainer , 2 = Vendor, 3 = Mob, 4 = Quest, 5 = Seasonal, 6 = Reputation --]]
-		if ( v["Type"] == 1 ) then
+		if (v["Type"] == 1) then
 			-- Trainer
 			-- Trainerdb : 	Trainer: ID, Name, Location, Coords, Faction
 			local display = false
 			local trnr = trainerDB[v["ID"]]
-			if ( filterDB.general.faction ~= true ) then
-				if ( ( trnr["Faction"] == BFAC[myFaction] ) or
-					 ( trnr["Faction"] == BFAC["Neutral"] ) or
-					 ( trnr["Faction"] == nil ) ) then
+			if (filterDB.general.faction ~= true) then
+				if ((trnr["Faction"] == BFAC[myFaction]) or
+					 (trnr["Faction"] == BFAC["Neutral"]) or
+					 (trnr["Faction"] == nil)) then
 					display = true
 				end
 			else
 				display = true
 			end
-			if ( display == true ) then
+			if (display == true) then
 				-- properly colourize
-				local tStr = addon:Trainer( L["Trainer"] .. " : " )
+				local tStr = addon:Trainer(L["Trainer"] .. " : ")
 				local nStr = ""
-				local cStr = addon:Coords( "(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")" )
+				local cStr = addon:Coords("(" .. trnr["Coordx"] .. ", " .. trnr["Coordy"] .. ")")

 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-				if ( trnr["Faction"] == BFAC["Horde"] ) then
-					nStr = addon:Horde( trnr["Name"] )
-				elseif ( trnr["Faction"] == BFAC["Alliance"] ) then
-					nStr = addon:Alliance( trnr["Name"] )
+				if (trnr["Faction"] == BFAC["Horde"]) then
+					nStr = addon:Horde(trnr["Name"])
+				elseif (trnr["Faction"] == BFAC["Alliance"]) then
+					nStr = addon:Alliance(trnr["Name"])
 				else
-					nStr = addon:Neutral( trnr["Name"] )
+					nStr = addon:Neutral(trnr["Name"])
 				end
 				t.String = pad .. tStr .. nStr

-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. pad .. trnr["Location"] .. " " .. cStr
-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 			end
-		elseif ( ( v["Type"] == 2 ) and
-				 ( filterDB.obtain.vendor == true ) ) then
+		elseif ((v["Type"] == 2) and
+				 (filterDB.obtain.vendor == true)) then
 			-- Vendor
 			-- VendorDB : ID, Name, Location, Coords, Faction
 			local display = false
 			local vndr = vendorDB[v["ID"]]
-			if ( filterDB.general.faction ~= true ) then
-				if ( ( vndr["Faction"] == BFAC[myFaction] ) or
-					 ( vndr["Faction"] == BFAC["Neutral"] ) or
-					 ( vndr["Faction"] == nil ) ) then
+			if (filterDB.general.faction ~= true) then
+				if ((vndr["Faction"] == BFAC[myFaction]) or
+					 (vndr["Faction"] == BFAC["Neutral"]) or
+					 (vndr["Faction"] == nil)) then
 					display = true
 				end
 			else
 				display = true
 			end
-			if ( display == true ) then
+			if (display == true) then
 				-- properly colourize
-				local tStr = addon:Vendor( L["Vendor"] .. " : " )
+				local tStr = addon:Vendor(L["Vendor"] .. " : ")
 				local nStr = ""
-				local cStr = addon:Coords( "(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")" )
+				local cStr = addon:Coords("(" .. vndr["Coordx"] .. ", " .. vndr["Coordy"] .. ")")

 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-				if ( vndr["Faction"] == BFAC["Horde"] ) then
-					nStr = addon:Horde( vndr["Name"] )
-				elseif ( vndr["Faction"] == BFAC["Alliance"] ) then
-					nStr = addon:Alliance( vndr["Name"] )
+				if (vndr["Faction"] == BFAC["Horde"]) then
+					nStr = addon:Horde(vndr["Name"])
+				elseif (vndr["Faction"] == BFAC["Alliance"]) then
+					nStr = addon:Alliance(vndr["Name"])
 				else
-					nStr = addon:Neutral( vndr["Name"] )
+					nStr = addon:Neutral(vndr["Name"])
 				end
 				t.String = pad .. tStr .. nStr

-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. pad .. vndr["Location"] .. " " .. cStr
-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 			end
-		elseif ( ( v["Type"] == 3 ) and ( filterDB.obtain.mobdrop == true ) ) then
+		elseif ((v["Type"] == 3) and (filterDB.obtain.mobdrop == true)) then
 			-- Mob Drop Obtain
 			-- MobDB: ID, Name, Zone, Coordx, Coordy
 			local mob = mobDB[v["ID"]]

 			-- properly colourize
-			local tStr = addon:MobDrop( L["Mob Drop"] .. " : " )
+			local tStr = addon:MobDrop(L["Mob Drop"] .. " : ")
 			local nStr = ""
-			local cStr = addon:Coords( "(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")" )
+			local cStr = addon:Coords("(" .. mob["Coordx"] .. ", " .. mob["Coordy"] .. ")")

 			t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-			nStr = addon:Horde( mob["Name"] )
+			nStr = addon:Horde(mob["Name"])
 			t.String = pad .. tStr .. nStr

-			tinsert( DisplayStrings, dsIndex, t )
+			tinsert(DisplayStrings, dsIndex, t)
 			dsIndex = dsIndex + 1
 			t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 			t.String = pad .. pad .. mob["Location"] .. " " .. cStr
-			tinsert( DisplayStrings, dsIndex, t )
+			tinsert(DisplayStrings, dsIndex, t)
 			dsIndex = dsIndex + 1
-		elseif ( ( v["Type"] == 4 ) and
-				 ( filterDB.obtain.quest ) ) then
+		elseif ((v["Type"] == 4) and
+				 (filterDB.obtain.quest)) then
 			-- Quest Obtain
 			-- Quest: ID, Name, Location, Coords to start, Faction
 			local display = false
 			local qst = questDB[v["ID"]]
-			if ( qst ) then
-				if ( filterDB.general.faction ~= true ) then
-					if ( ( qst["Faction"] == BFAC[myFaction] ) or
-						 ( qst["Faction"] == BFAC["Neutral"] ) or
-						 ( qst["Faction"] == nil ) ) then
+			if (qst) then
+				if (filterDB.general.faction ~= true) then
+					if ((qst["Faction"] == BFAC[myFaction]) or
+						 (qst["Faction"] == BFAC["Neutral"]) or
+						 (qst["Faction"] == nil)) then
 						display = true
 					end
 				else
 					display = true
 				end
 			end
-			if ( display == true ) then
+			if (display == true) then
 				-- properly colourize
-				local tStr = addon:Quest( L["Quest"] .. " : " )
+				local tStr = addon:Quest(L["Quest"] .. " : ")
 				local nStr = ""
-				local cStr = addon:Coords( "(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")" )
+				local cStr = addon:Coords("(" .. qst["Coordx"] .. ", " .. qst["Coordy"] .. ")")

 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-				if ( qst["Faction"] == BFAC["Horde"] ) then
-					nStr = addon:Horde( qst["Name"] )
-				elseif ( qst["Faction"] == BFAC["Alliance"] ) then
-					nStr = addon:Alliance( qst["Name"] )
+				if (qst["Faction"] == BFAC["Horde"]) then
+					nStr = addon:Horde(qst["Name"])
+				elseif (qst["Faction"] == BFAC["Alliance"]) then
+					nStr = addon:Alliance(qst["Name"])
 				else
-					nStr = addon:Neutral( qst["Name"] )
+					nStr = addon:Neutral(qst["Name"])
 				end
 				t.String = pad .. tStr .. nStr

-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. pad .. qst["Location"] .. " " .. cStr
-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 			end
-		elseif ( v["Type"] == 5 ) then
+		elseif (v["Type"] == 5) then
 			-- Seasonal: ID, Name
 			local ssnname = seasonDB[v["ID"]]["Name"]
 			t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-			local tStr = addon:Season( L["Seasonal"] .. " : " .. ssnname )
+			local tStr = addon:Season(L["Seasonal"] .. " : " .. ssnname)
 			t.String = pad .. tStr
-			tinsert( DisplayStrings, dsIndex, t )
+			tinsert(DisplayStrings, dsIndex, t)
 			dsIndex = dsIndex + 1
-		elseif ( v["Type"] == 6 ) then -- Need to check if we're displaying the currently id'd rep or not as well
+		elseif (v["Type"] == 6) then -- Need to check if we're displaying the currently id'd rep or not as well
 			-- Reputation Obtain
 			-- Rep: ID, Faction
 			-- RepLevel = 0 (Neutral), 1 (Friendly), 2 (Honored), 3 (Revered), 4 (Exalted)
@@ -1497,55 +1569,55 @@ function expandEntry( dsIndex )
 			local rplvl = v["RepLevel"]
 			local repvndr = vendorDB[v["RepVendor"]]

-			if ( filterDB.general.faction ~= true ) then
-				if ( ( repvndr["Faction"] == BFAC[myFaction] ) or
-					 ( repvndr["Faction"] == BFAC["Neutral"] ) or
-					 ( repvndr["Faction"] == nil ) ) then
+			if (filterDB.general.faction ~= true) then
+				if ((repvndr["Faction"] == BFAC[myFaction]) or
+					 (repvndr["Faction"] == BFAC["Neutral"]) or
+					 (repvndr["Faction"] == nil)) then
 					display = true
 				end
 			else
 				display = true
 			end
-			if ( display == true ) then
+			if (display == true) then
 				-- properly colourize
-				local tStr = addon:Rep( L["Reputation"] .. " : " )
+				local tStr = addon:Rep(L["Reputation"] .. " : ")
 				local nStr = ""
 				local rStr = ""
-				local cStr = addon:Coords( "(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")" )
+				local cStr = addon:Coords("(" .. repvndr["Coordx"] .. ", " .. repvndr["Coordy"] .. ")")

 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. tStr .. repname
-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1

 			-- RepLevel = 0 (Neutral), 1 (Friendly), 2 (Honored), 3 (Revered), 4 (Exalted)
-				if ( rplvl == 0 ) then rStr = addon:Neutral( BFAC["Neutral"] .. " : " )
-				elseif ( rplvl == 1 ) then rStr = addon:Friendly( BFAC["Neutral"] .. " : " )
-				elseif ( rplvl == 2 ) then rStr = addon:Honored( BFAC["Honored"] .. " : " )
-				elseif ( rplvl == 3 ) then rStr = addon:Revered( BFAC["Revered"] .. " : " )
-				else rStr = addon:Exalted( BFAC["Exalted"] .. " : " ) end
-
-				if ( repvndr["Faction"] == BFAC["Horde"] ) then
-					nStr = addon:Horde( repvndr["Name"] )
-				elseif ( repvndr["Faction"] == BFAC["Alliance"] ) then
-					nStr = addon:Alliance( repvndr["Name"] )
+				if (rplvl == 0) then rStr = addon:Neutral(BFAC["Neutral"] .. " : ")
+				elseif (rplvl == 1) then rStr = addon:Friendly(BFAC["Neutral"] .. " : ")
+				elseif (rplvl == 2) then rStr = addon:Honored(BFAC["Honored"] .. " : ")
+				elseif (rplvl == 3) then rStr = addon:Revered(BFAC["Revered"] .. " : ")
+				else rStr = addon:Exalted(BFAC["Exalted"] .. " : ") end
+
+				if (repvndr["Faction"] == BFAC["Horde"]) then
+					nStr = addon:Horde(repvndr["Name"])
+				elseif (repvndr["Faction"] == BFAC["Alliance"]) then
+					nStr = addon:Alliance(repvndr["Name"])
 				else
-					nStr = addon:Neutral( repvndr["Name"] )
+					nStr = addon:Neutral(repvndr["Name"])
 				end
 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. pad .. rStr .. nStr

-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 				t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
 				t.String = pad .. pad .. pad .. repvndr["Location"] .. " " .. cStr
-				tinsert( DisplayStrings, dsIndex, t )
+				tinsert(DisplayStrings, dsIndex, t)
 				dsIndex = dsIndex + 1
 			end
-		elseif ( ( v["Type"] == 7 ) and ( filterDB.obtain.worlddrop == true ) ) then
+		elseif ((v["Type"] == 7) and (filterDB.obtain.worlddrop == true)) then
 			t = {}; t.IsRecipe = false; t.sID = recipeIndex; t.IsExpanded = true
-			t.String = pad .. addon:RarityColor( v["ID"] + 1, L["World Drop"] )
-			tinsert( DisplayStrings, dsIndex, t )
+			t.String = pad .. addon:RarityColor(v["ID"] + 1, L["World Drop"])
+			tinsert(DisplayStrings, dsIndex, t)
 			dsIndex = dsIndex + 1
 		else
 			t = {}
@@ -1553,7 +1625,7 @@ function expandEntry( dsIndex )
 			t.sID = recipeIndex
 			t.IsExpanded = true
 			t.String = "Unhandled Acquire Case"
-			tinsert( DisplayStrings, dsIndex, t )
+			tinsert(DisplayStrings, dsIndex, t)
 			dsIndex = dsIndex + 1
 		end
 	end
@@ -1562,7 +1634,7 @@ function expandEntry( dsIndex )
 end

 -- What to do if someone clicks on a recipe button
-function addon.RecipeItem_OnClick( button )
+function addon.RecipeItem_OnClick(button)
 	local clickedIndex = addon.RecipeListButton[button].sI
 	local isRecipe = DisplayStrings[clickedIndex].IsRecipe
 	local isExpanded = DisplayStrings[clickedIndex].IsExpanded
@@ -1571,27 +1643,27 @@ function addon.RecipeItem_OnClick( button )
 	local traverseIndex = 0

 	-- First, check if this is a "modified" click, and react appropriately
-	if ( IsShiftKeyDown() ) then
+	if (IsShiftKeyDown()) then
 		local itemID = recipeDB[clickedSpellIndex]["ItemID"]
-		local _, itemLink = GetItemInfo( itemID )
-		ChatFrameEditBox:Insert( itemLink )
-	elseif ( IsControlKeyDown() ) then
-		ChatFrameEditBox:Insert( recipeDB[clickedSpellIndex]["RecipeLink"] )
-	elseif ( IsAltKeyDown() ) then
+		local _, itemLink = GetItemInfo(itemID)
+		ChatFrameEditBox:Insert(itemLink)
+	elseif (IsControlKeyDown()) then
+		ChatFrameEditBox:Insert(recipeDB[clickedSpellIndex]["RecipeLink"])
+	elseif (IsAltKeyDown()) then
 		-- Code needed here to insert this item into the "Ignore List"
-		addon:ToggleExcludeRecipe( clickedSpellIndex )
+		addon:ToggleExcludeRecipe(clickedSpellIndex)
 		ReDisplay()
 	else
 		-- three possibilities here
 		-- 1) We clicked on the recipe button on a closed recipe
 		-- 2) We clicked on the recipe button of an open recipe
 		-- 3) we clicked on the expanded text of an open recipe
-		if ( isRecipe ) then
-			if ( isExpanded ) then
+		if (isRecipe) then
+			if (isExpanded) then
 				-- get rid of our expanded lines
 				traverseIndex = clickedIndex + 1
-				while ( DisplayStrings[traverseIndex].IsRecipe == false ) do
-					tremove( DisplayStrings, traverseIndex )
+				while (DisplayStrings[traverseIndex].IsRecipe == false) do
+					tremove(DisplayStrings, traverseIndex)
 					-- if this is the last entry in the whole list, we should break out
 					if not DisplayStrings[traverseIndex] then
 						break
@@ -1600,7 +1672,7 @@ function addon.RecipeItem_OnClick( button )
 				DisplayStrings[clickedIndex].IsExpanded = false
 			else
 				-- add in our expanded lines
-				expandEntry( clickedIndex )
+				expandEntry(clickedIndex)
 				-- set our current recipe to expanded
 				DisplayStrings[clickedIndex].IsExpanded = true
 			end
@@ -1608,15 +1680,15 @@ function addon.RecipeItem_OnClick( button )
 			-- this inherently implies that we're on an expanded recipe
 			-- first, back up in the list of buttons until we find our recipe line
 			traverseIndex = clickedIndex - 1
-			while ( DisplayStrings[traverseIndex].IsRecipe == false ) do
+			while (DisplayStrings[traverseIndex].IsRecipe == false) do
 				traverseIndex = traverseIndex - 1
 			end
 			-- unexpand it
 			DisplayStrings[traverseIndex].IsExpanded = false
 			-- now remove the expanded lines until we get to a recipe again
 			traverseIndex = traverseIndex + 1
-			while ( DisplayStrings[traverseIndex].IsRecipe == false ) do
-				tremove( DisplayStrings, traverseIndex )
+			while (DisplayStrings[traverseIndex].IsRecipe == false) do
+				tremove(DisplayStrings, traverseIndex)
 			end
 		end
 		-- finally, call our scrollframe updater
@@ -1625,73 +1697,73 @@ function addon.RecipeItem_OnClick( button )
 end

 -- Rep Filtering panel switcher
-function addon.RepFilterSwitch( whichrep )
+function addon.RepFilterSwitch(whichrep)
 	-- 1	ARL_RepOldWorldCB		Old World Rep
 	-- 2	ARL_RepBCCB				Burning Crusade
 	-- 3	ARL_RepLKCB				Wrath of the Lich King
 	local ShowPanel = false
-	if ( whichrep == 1 ) then
-		if ( ARL_RepOldWorldCB:GetChecked() ) then
+	if (whichrep == 1) then
+		if (ARL_RepOldWorldCB:GetChecked()) then
 			ShowPanel = true
 			addon.Fly_Rep_OW:Show()
 			addon.Fly_Rep_BC:Hide()
 			addon.Fly_Rep_LK:Hide()
-			ARL_RepBCCB:SetChecked( false )
-			ARL_RepLKCB:SetChecked( false )
+			ARL_RepBCCB:SetChecked(false)
+			ARL_RepLKCB:SetChecked(false)
 		else
 			ShowPanel = false
 		end
-	elseif ( whichrep == 2 ) then
-		if ( ARL_RepBCCB:GetChecked() ) then
+	elseif (whichrep == 2) then
+		if (ARL_RepBCCB:GetChecked()) then
 			ShowPanel = true
 			addon.Fly_Rep_OW:Hide()
 			addon.Fly_Rep_BC:Show()
 			addon.Fly_Rep_LK:Hide()
-			ARL_RepOldWorldCB:SetChecked( false )
-			ARL_RepLKCB:SetChecked( false )
+			ARL_RepOldWorldCB:SetChecked(false)
+			ARL_RepLKCB:SetChecked(false)
 		else
 			ShowPanel = false
 		end
 	else -- whichrep == 3 (WotLK)
-		if ( ARL_RepLKCB:GetChecked() ) then
+		if (ARL_RepLKCB:GetChecked()) then
 			ShowPanel = true
 			addon.Fly_Rep_OW:Hide()
 			addon.Fly_Rep_BC:Hide()
 			addon.Fly_Rep_LK:Show()
-			ARL_RepOldWorldCB:SetChecked( false )
-			ARL_RepBCCB:SetChecked( false )
+			ARL_RepOldWorldCB:SetChecked(false)
+			ARL_RepBCCB:SetChecked(false)
 		else
 			ShowPanel = false
 		end
 	end
-	if ( ShowPanel == true ) then
+	if (ShowPanel == true) then
 		addon.flyTexture:ClearAllPoints()
 		addon.Flyaway:SetWidth(296)
 		addon.Flyaway:SetHeight(312)
-		addon.flyTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\fly_repcol]] )
-		addon.flyTexture:SetAllPoints( addon.Flyaway )
-		addon.flyTexture:SetTexCoord( 0, (296/512), 0, (312/512) )
+		addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_repcol]])
+		addon.flyTexture:SetAllPoints(addon.Flyaway)
+		addon.flyTexture:SetTexCoord(0, (296/512), 0, (312/512))

-		addon.Fly_Rep_OW:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20 )
-		addon.Fly_Rep_BC:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20 )
-		addon.Fly_Rep_LK:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20 )
+		addon.Fly_Rep_OW:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20)
+		addon.Fly_Rep_BC:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20)
+		addon.Fly_Rep_LK:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -20)
 	else
 		addon.flyTexture:ClearAllPoints()
 		addon.Flyaway:SetWidth(136)
 		addon.Flyaway:SetHeight(312)
-		addon.flyTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\fly_1col]] )
-		addon.flyTexture:SetAllPoints( addon.Flyaway )
-		addon.flyTexture:SetTexCoord( 0, (136/256), 0, (312/512) )
+		addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_1col]])
+		addon.flyTexture:SetAllPoints(addon.Flyaway)
+		addon.flyTexture:SetTexCoord(0, (136/256), 0, (312/512))
 		addon.Fly_Rep_OW:Hide()
 		addon.Fly_Rep_BC:Hide()
 		addon.Fly_Rep_LK:Hide()
-		ARL_RepOldWorldCB:SetChecked( false )
-		ARL_RepBCCB:SetChecked( false )
-		ARL_RepLKCB:SetChecked( false )
+		ARL_RepOldWorldCB:SetChecked(false)
+		ARL_RepBCCB:SetChecked(false)
+		ARL_RepLKCB:SetChecked(false)
 	end
 end

-function addon.setFlyawayState ( )
+function addon.setFlyawayState ()
 	-- This function sets all the current options in the flyaway panel to make
 	-- sure they are consistent with the SV options. This is run every time the
 	-- Flyaway panel "OnShow" triggers
@@ -1699,132 +1771,132 @@ function addon.setFlyawayState ( )
 	local armordb = filterdb.item.armor
 	local weapondb = filterdb.item.weapon
 	-- General Options
-	ARL_ClassCB:SetChecked( filterdb.general.class )
-	ARL_SpecialtyCB:SetChecked( filterdb.general.specialty )
-	ARL_LevelCB:SetChecked( filterdb.general.skill )
-	ARL_FactionCB:SetChecked( filterdb.general.faction )
-	ARL_KnownCB:SetChecked( filterdb.general.known )
-	ARL_UnknownCB:SetChecked( filterdb.general.unknown )
+	ARL_ClassCB:SetChecked(filterdb.general.class)
+	ARL_SpecialtyCB:SetChecked(filterdb.general.specialty)
+	ARL_LevelCB:SetChecked(filterdb.general.skill)
+	ARL_FactionCB:SetChecked(filterdb.general.faction)
+	ARL_KnownCB:SetChecked(filterdb.general.known)
+	ARL_UnknownCB:SetChecked(filterdb.general.unknown)
 	-- Obtain Options
-	ARL_InstanceCB:SetChecked( filterdb.obtain.instance )
-	ARL_RaidCB:SetChecked( filterdb.obtain.raid )
-	ARL_QuestCB:SetChecked( filterdb.obtain.quest )
-	ARL_SeasonalCB:SetChecked( filterdb.obtain.seasonal )
-	ARL_TrainerCB:SetChecked( filterdb.obtain.trainer )
-	ARL_VendorCB:SetChecked( filterdb.obtain.vendor )
-	ARL_PVPCB:SetChecked( filterdb.obtain.pvp )
-	ARL_DiscoveryCB:SetChecked( filterdb.obtain.discovery )
-	ARL_WorldDropCB:SetChecked( filterdb.obtain.worlddrop )
-	ARL_MobDropCB:SetChecked( filterdb.obtain.mobdrop )
+	ARL_InstanceCB:SetChecked(filterdb.obtain.instance)
+	ARL_RaidCB:SetChecked(filterdb.obtain.raid)
+	ARL_QuestCB:SetChecked(filterdb.obtain.quest)
+	ARL_SeasonalCB:SetChecked(filterdb.obtain.seasonal)
+	ARL_TrainerCB:SetChecked(filterdb.obtain.trainer)
+	ARL_VendorCB:SetChecked(filterdb.obtain.vendor)
+	ARL_PVPCB:SetChecked(filterdb.obtain.pvp)
+	ARL_DiscoveryCB:SetChecked(filterdb.obtain.discovery)
+	ARL_WorldDropCB:SetChecked(filterdb.obtain.worlddrop)
+	ARL_MobDropCB:SetChecked(filterdb.obtain.mobdrop)
 	-- Binding Options
-	ARL_iBoECB:SetChecked( filterdb.binding.itemboe )
-	ARL_iBoPCB:SetChecked( filterdb.binding.itembop )
-	ARL_rBoECB:SetChecked( filterdb.binding.recipeboe )
-	ARL_rBoPCB:SetChecked( filterdb.binding.recipebop )
+	ARL_iBoECB:SetChecked(filterdb.binding.itemboe)
+	ARL_iBoPCB:SetChecked(filterdb.binding.itembop)
+	ARL_rBoECB:SetChecked(filterdb.binding.recipeboe)
+	ARL_rBoPCB:SetChecked(filterdb.binding.recipebop)
 	-- Armor Options
-	if ( ( armordb.cloth == true ) and ( armordb.leather == true ) and
-		 ( armordb.mail == true ) and ( armordb.plate == true ) and
-		 ( armordb.cloak == true ) and ( armordb.necklace == true ) and
-		 ( armordb.ring == true ) and ( armordb.trinket == true ) ) then
-		ARL_ArmorAllCB:SetChecked( true )
+	if ((armordb.cloth == true) and (armordb.leather == true) and
+		 (armordb.mail == true) and (armordb.plate == true) and
+		 (armordb.cloak == true) and (armordb.necklace == true) and
+		 (armordb.ring == true) and (armordb.trinket == true)) then
+		ARL_ArmorAllCB:SetChecked(true)
 	else
-		ARL_ArmorAllCB:SetChecked( false )
+		ARL_ArmorAllCB:SetChecked(false)
 	end
-	if ( ( armordb.cloth == false ) and ( armordb.leather == false ) and
-		 ( armordb.mail == false ) and ( armordb.plate == false ) and
-		 ( armordb.cloak == false ) and ( armordb.necklace == false ) and
-		 ( armordb.ring == false ) and ( armordb.trinket == false ) ) then
-		ARL_ArmorNoneCB:SetChecked( true )
+	if ((armordb.cloth == false) and (armordb.leather == false) and
+		 (armordb.mail == false) and (armordb.plate == false) and
+		 (armordb.cloak == false) and (armordb.necklace == false) and
+		 (armordb.ring == false) and (armordb.trinket == false)) then
+		ARL_ArmorNoneCB:SetChecked(true)
 	else
-		ARL_ArmorNoneCB:SetChecked( false )
+		ARL_ArmorNoneCB:SetChecked(false)
 	end
-	ARL_ArmorClothCB:SetChecked( armordb.cloth )
-	ARL_ArmorLeatherCB:SetChecked( armordb.leather )
-	ARL_ArmorMailCB:SetChecked( armordb.mail )
-	ARL_ArmorPlateCB:SetChecked( armordb.plate )
-	ARL_ArmorCloakCB:SetChecked( armordb.cloak )
-	ARL_ArmorNecklaceCB:SetChecked( armordb.necklace )
-	ARL_ArmorRingCB:SetChecked( armordb.ring )
-	ARL_ArmorTrinketCB:SetChecked( armordb.trinket )
+	ARL_ArmorClothCB:SetChecked(armordb.cloth)
+	ARL_ArmorLeatherCB:SetChecked(armordb.leather)
+	ARL_ArmorMailCB:SetChecked(armordb.mail)
+	ARL_ArmorPlateCB:SetChecked(armordb.plate)
+	ARL_ArmorCloakCB:SetChecked(armordb.cloak)
+	ARL_ArmorNecklaceCB:SetChecked(armordb.necklace)
+	ARL_ArmorRingCB:SetChecked(armordb.ring)
+	ARL_ArmorTrinketCB:SetChecked(armordb.trinket)
 	-- Weapon Options
-	if ( ( weapondb.onehand == true ) and ( weapondb.twohand == true ) and
-		 ( weapondb.dagger == true ) and ( weapondb.axe == true ) and
-		 ( weapondb.mace == true ) and ( weapondb.sword == true ) and
-		 ( weapondb.polearm == true ) and ( weapondb.wand == true ) and
-		 ( weapondb.thrown == true ) and ( weapondb.ammo == true ) and
-		 ( weapondb.fist == true ) ) then
-		ARL_WeaponAllCB:SetChecked( true )
+	if ((weapondb.onehand == true) and (weapondb.twohand == true) and
+		 (weapondb.dagger == true) and (weapondb.axe == true) and
+		 (weapondb.mace == true) and (weapondb.sword == true) and
+		 (weapondb.polearm == true) and (weapondb.wand == true) and
+		 (weapondb.thrown == true) and (weapondb.ammo == true) and
+		 (weapondb.fist == true)) then
+		ARL_WeaponAllCB:SetChecked(true)
 	else
-		ARL_WeaponAllCB:SetChecked( false )
+		ARL_WeaponAllCB:SetChecked(false)
 	end
-	if ( ( weapondb.onehand == false ) and ( weapondb.twohand == false ) and
-		 ( weapondb.dagger == false ) and ( weapondb.axe == false ) and
-		 ( weapondb.mace == false ) and ( weapondb.sword == false ) and
-		 ( weapondb.polearm == false ) and ( weapondb.wand == false ) and
-		 ( weapondb.thrown == false ) and ( weapondb.ammo == false ) and
-		 ( weapondb.fist == false ) ) then
-		ARL_WeaponNoneCB:SetChecked( true )
+	if ((weapondb.onehand == false) and (weapondb.twohand == false) and
+		 (weapondb.dagger == false) and (weapondb.axe == false) and
+		 (weapondb.mace == false) and (weapondb.sword == false) and
+		 (weapondb.polearm == false) and (weapondb.wand == false) and
+		 (weapondb.thrown == false) and (weapondb.ammo == false) and
+		 (weapondb.fist == false)) then
+		ARL_WeaponNoneCB:SetChecked(true)
 	else
-		ARL_WeaponNoneCB:SetChecked( false )
+		ARL_WeaponNoneCB:SetChecked(false)
 	end
-	ARL_Weapon1HCB:SetChecked( weapondb.onehand )
-	ARL_Weapon2HCB:SetChecked( weapondb.twohand )
-	ARL_WeaponDaggerCB:SetChecked( weapondb.dagger )
-	ARL_WeaponAxeCB:SetChecked( weapondb.axe )
-	ARL_WeaponMaceCB:SetChecked( weapondb.mace )
-	ARL_WeaponSwordCB:SetChecked( weapondb.sword )
-	ARL_WeaponPolearmCB:SetChecked( weapondb.polearm )
-	ARL_WeaponWandCB:SetChecked( weapondb.wand )
-	ARL_WeaponThrownCB:SetChecked( weapondb.thrown )
-	ARL_WeaponAmmoCB:SetChecked( weapondb.ammo )
-	ARL_WeaponFistCB:SetChecked( weapondb.fist )
+	ARL_Weapon1HCB:SetChecked(weapondb.onehand)
+	ARL_Weapon2HCB:SetChecked(weapondb.twohand)
+	ARL_WeaponDaggerCB:SetChecked(weapondb.dagger)
+	ARL_WeaponAxeCB:SetChecked(weapondb.axe)
+	ARL_WeaponMaceCB:SetChecked(weapondb.mace)
+	ARL_WeaponSwordCB:SetChecked(weapondb.sword)
+	ARL_WeaponPolearmCB:SetChecked(weapondb.polearm)
+	ARL_WeaponWandCB:SetChecked(weapondb.wand)
+	ARL_WeaponThrownCB:SetChecked(weapondb.thrown)
+	ARL_WeaponAmmoCB:SetChecked(weapondb.ammo)
+	ARL_WeaponFistCB:SetChecked(weapondb.fist)
 --[[
 	--Disable weapon options. Probably don't need to touch these...
 	ARL_WeaponStaffCB
 	ARL_WeaponBowCB
 	ARL_WeaponCrossbowCB ]]--
 	-- Player Type Options
-	ARL_PlayerTankCB:SetChecked( filterdb.player.tank )
-	ARL_PlayerMeleeCB:SetChecked( filterdb.player.melee )
-	ARL_PlayerHealerCB:SetChecked( filterdb.player.healer )
-	ARL_PlayerCasterCB:SetChecked( filterdb.player.caster )
+	ARL_PlayerTankCB:SetChecked(filterdb.player.tank)
+	ARL_PlayerMeleeCB:SetChecked(filterdb.player.melee)
+	ARL_PlayerHealerCB:SetChecked(filterdb.player.healer)
+	ARL_PlayerCasterCB:SetChecked(filterdb.player.caster)
 	-- Old World Rep Options
-	ARL_RepArgentDawnCB:SetChecked( filterdb.rep.argentdawn )
-	ARL_RepCenarionCircleCB:SetChecked( filterdb.rep.cenarioncircle )
-	ARL_RepThoriumCB:SetChecked( filterdb.rep.thoriumbrotherhood )
-	ARL_RepTimbermawCB:SetChecked( filterdb.rep.timbermaw )
-	ARL_RepZandalarCB:SetChecked( filterdb.rep.zandalar )
+	ARL_RepArgentDawnCB:SetChecked(filterdb.rep.argentdawn)
+	ARL_RepCenarionCircleCB:SetChecked(filterdb.rep.cenarioncircle)
+	ARL_RepThoriumCB:SetChecked(filterdb.rep.thoriumbrotherhood)
+	ARL_RepTimbermawCB:SetChecked(filterdb.rep.timbermaw)
+	ARL_RepZandalarCB:SetChecked(filterdb.rep.zandalar)
 	-- BC Rep Options
-	ARL_RepAldorCB:SetChecked( filterdb.rep.aldor )
-	ARL_RepAshtongueCB:SetChecked( filterdb.rep.ashtonguedeathsworn )
-	ARL_RepCenarionExpeditionCB:SetChecked( filterdb.rep.cenarionexpedition )
-	ARL_RepConsortiumCB:SetChecked( filterdb.rep.consortium )
-	ARL_RepHonorHoldCB:SetChecked( filterdb.rep.hellfire )
-	ARL_RepKeepersOfTimeCB:SetChecked( filterdb.rep.keepersoftime )
-	ARL_RepKurenaiCB:SetChecked( filterdb.rep.nagrand )
-	ARL_RepLowerCityCB:SetChecked( filterdb.rep.lowercity )
-	ARL_RepScaleSandsCB:SetChecked( filterdb.rep.scaleofthesands )
-	ARL_RepScryersCB:SetChecked( filterdb.rep.scryer )
-	ARL_RepShatarCB:SetChecked( filterdb.rep.shatar )
-	ARL_RepShatteredSunCB:SetChecked( filterdb.rep.shatteredsun )
-	ARL_RepSporeggarCB:SetChecked( filterdb.rep.sporeggar )
-	ARL_RepVioletEyeCB:SetChecked( filterdb.rep.violeteye )
+	ARL_RepAldorCB:SetChecked(filterdb.rep.aldor)
+	ARL_RepAshtongueCB:SetChecked(filterdb.rep.ashtonguedeathsworn)
+	ARL_RepCenarionExpeditionCB:SetChecked(filterdb.rep.cenarionexpedition)
+	ARL_RepConsortiumCB:SetChecked(filterdb.rep.consortium)
+	ARL_RepHonorHoldCB:SetChecked(filterdb.rep.hellfire)
+	ARL_RepKeepersOfTimeCB:SetChecked(filterdb.rep.keepersoftime)
+	ARL_RepKurenaiCB:SetChecked(filterdb.rep.nagrand)
+	ARL_RepLowerCityCB:SetChecked(filterdb.rep.lowercity)
+	ARL_RepScaleSandsCB:SetChecked(filterdb.rep.scaleofthesands)
+	ARL_RepScryersCB:SetChecked(filterdb.rep.scryer)
+	ARL_RepShatarCB:SetChecked(filterdb.rep.shatar)
+	ARL_RepShatteredSunCB:SetChecked(filterdb.rep.shatteredsun)
+	ARL_RepSporeggarCB:SetChecked(filterdb.rep.sporeggar)
+	ARL_RepVioletEyeCB:SetChecked(filterdb.rep.violeteye)
 -- Below this is WotLK stuff. May need to be changed post beta.
-	ARL_RepArgentCrusadeCB:SetChecked( filterdb.rep.argentcrusade )
-	ARL_RepFrenzyheartCB:SetChecked( filterdb.rep.frenzyheart )
-	ARL_RepEbonBladeCB:SetChecked( filterdb.rep.ebonblade )
-	ARL_RepKirinTorCB:SetChecked( filterdb.rep.kirintor )
-	ARL_RepSonsOfHodirCB:SetChecked( filterdb.rep.sonsofhodir )
-	ARL_RepKaluakCB:SetChecked( filterdb.rep.kaluak )
-	ARL_RepOraclesCB:SetChecked( filterdb.rep.oracles )
-	ARL_RepWyrmrestCB:SetChecked( filterdb.rep.wyrmrest )
-	ARL_RepSilverCovenantCB:SetChecked( filterdb.rep.silvercovenant )
-	ARL_RepSunreaversCB:SetChecked( filterdb.rep.sunreavers )
-	ARL_RepExplorersLeagueCB:SetChecked( filterdb.rep.explorersleague )
-	ARL_RepValianceCB:SetChecked( filterdb.rep.valiance )
-	ARL_RepHandOfVengeanceCB:SetChecked( filterdb.rep.handofvengeance )
-	ARL_RepTaunkaCB:SetChecked( filterdb.rep.taunka )
-	ARL_RepWarsongOffensiveCB:SetChecked( filterdb.rep.warsongoffensive )
+	ARL_RepArgentCrusadeCB:SetChecked(filterdb.rep.argentcrusade)
+	ARL_RepFrenzyheartCB:SetChecked(filterdb.rep.frenzyheart)
+	ARL_RepEbonBladeCB:SetChecked(filterdb.rep.ebonblade)
+	ARL_RepKirinTorCB:SetChecked(filterdb.rep.kirintor)
+	ARL_RepSonsOfHodirCB:SetChecked(filterdb.rep.sonsofhodir)
+	ARL_RepKaluakCB:SetChecked(filterdb.rep.kaluak)
+	ARL_RepOraclesCB:SetChecked(filterdb.rep.oracles)
+	ARL_RepWyrmrestCB:SetChecked(filterdb.rep.wyrmrest)
+	ARL_RepSilverCovenantCB:SetChecked(filterdb.rep.silvercovenant)
+	ARL_RepSunreaversCB:SetChecked(filterdb.rep.sunreavers)
+	ARL_RepExplorersLeagueCB:SetChecked(filterdb.rep.explorersleague)
+	ARL_RepValianceCB:SetChecked(filterdb.rep.valiance)
+	ARL_RepHandOfVengeanceCB:SetChecked(filterdb.rep.handofvengeance)
+	ARL_RepTaunkaCB:SetChecked(filterdb.rep.taunka)
+	ARL_RepWarsongOffensiveCB:SetChecked(filterdb.rep.warsongoffensive)
 end

 function addon.resetFilters()
@@ -1922,7 +1994,7 @@ function addon.resetFilters()
 	addon.Flyaway:Hide()
 end

-function addon.DoFlyaway( panel )
+function addon.DoFlyaway(panel)
 	-- This is going to manage the flyaway panel, as well as checking or unchecking the
 	-- buttons that got us here in the first place
 	--
@@ -1936,24 +2008,24 @@ function addon.DoFlyaway( panel )
 	addon.Fly_Rep_OW:Hide()
 	addon.Fly_Rep_BC:Hide()
 	addon.Fly_Rep_LK:Hide()
-	ARL_RepOldWorldCB:SetChecked( false )
-	ARL_RepBCCB:SetChecked( false )
-	ARL_RepLKCB:SetChecked( false )
-	if ( panel == 1 ) then
-		if ( ARL_ExpGeneralOptCB:GetChecked() ) then
+	ARL_RepOldWorldCB:SetChecked(false)
+	ARL_RepBCCB:SetChecked(false)
+	ARL_RepLKCB:SetChecked(false)
+	if (panel == 1) then
+		if (ARL_ExpGeneralOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpObtainOptCB:SetChecked( false )
-			ARL_ExpBindingOptCB:SetChecked( false )
-			ARL_ExpItemOptCB:SetChecked( false )
-			ARL_ExpPlayerOptCB:SetChecked( false )
-			ARL_ExpRepOptCB:SetChecked( false )
+			ARL_ExpObtainOptCB:SetChecked(false)
+			ARL_ExpBindingOptCB:SetChecked(false)
+			ARL_ExpItemOptCB:SetChecked(false)
+			ARL_ExpPlayerOptCB:SetChecked(false)
+			ARL_ExpRepOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:White( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
---			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:White(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
+--			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Show()
 			addon.Fly_Obtain:Hide()
@@ -1964,24 +2036,24 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
 			ChangeFilters = false
 		end
-	elseif ( panel == 2 ) then
-		if ( ARL_ExpObtainOptCB:GetChecked() ) then
+	elseif (panel == 2) then
+		if (ARL_ExpObtainOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpGeneralOptCB:SetChecked( false )
-			ARL_ExpBindingOptCB:SetChecked( false )
-			ARL_ExpItemOptCB:SetChecked( false )
-			ARL_ExpPlayerOptCB:SetChecked( false )
-			ARL_ExpRepOptCB:SetChecked( false )
+			ARL_ExpGeneralOptCB:SetChecked(false)
+			ARL_ExpBindingOptCB:SetChecked(false)
+			ARL_ExpItemOptCB:SetChecked(false)
+			ARL_ExpPlayerOptCB:SetChecked(false)
+			ARL_ExpRepOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:White( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
---			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:White(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
+--			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Hide()
 			addon.Fly_Obtain:Show()
@@ -1992,24 +2064,24 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
 			ChangeFilters = false
 		end
-	elseif ( panel == 3 ) then
-		if ( ARL_ExpBindingOptCB:GetChecked() ) then
+	elseif (panel == 3) then
+		if (ARL_ExpBindingOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpGeneralOptCB:SetChecked( false )
-			ARL_ExpObtainOptCB:SetChecked( false )
-			ARL_ExpItemOptCB:SetChecked( false )
-			ARL_ExpPlayerOptCB:SetChecked( false )
-			ARL_ExpRepOptCB:SetChecked( false )
+			ARL_ExpGeneralOptCB:SetChecked(false)
+			ARL_ExpObtainOptCB:SetChecked(false)
+			ARL_ExpItemOptCB:SetChecked(false)
+			ARL_ExpPlayerOptCB:SetChecked(false)
+			ARL_ExpRepOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:White( ExpButtonText[3] ) )
---			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:White(ExpButtonText[3]))
+--			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Hide()
 			addon.Fly_Obtain:Hide()
@@ -2020,24 +2092,24 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
 			ChangeFilters = false
 		end
-	elseif ( panel == 4 ) then
-		if ( ARL_ExpItemOptCB:GetChecked() ) then
+	elseif (panel == 4) then
+		if (ARL_ExpItemOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpGeneralOptCB:SetChecked( false )
-			ARL_ExpObtainOptCB:SetChecked( false )
-			ARL_ExpBindingOptCB:SetChecked( false )
-			ARL_ExpPlayerOptCB:SetChecked( false )
-			ARL_ExpRepOptCB:SetChecked( false )
+			ARL_ExpGeneralOptCB:SetChecked(false)
+			ARL_ExpObtainOptCB:SetChecked(false)
+			ARL_ExpBindingOptCB:SetChecked(false)
+			ARL_ExpPlayerOptCB:SetChecked(false)
+			ARL_ExpRepOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
-			ARL_ExpItemOptCB.text:SetText( addon:White( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
+			ARL_ExpItemOptCB.text:SetText(addon:White(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Hide()
 			addon.Fly_Obtain:Hide()
@@ -2048,24 +2120,24 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
+			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
 			ChangeFilters = false
 		end
-	elseif ( panel == 5 ) then
-		if ( ARL_ExpPlayerOptCB:GetChecked() ) then
+	elseif (panel == 5) then
+		if (ARL_ExpPlayerOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpGeneralOptCB:SetChecked( false )
-			ARL_ExpObtainOptCB:SetChecked( false )
-			ARL_ExpBindingOptCB:SetChecked( false )
-			ARL_ExpItemOptCB:SetChecked( false )
-			ARL_ExpRepOptCB:SetChecked( false )
+			ARL_ExpGeneralOptCB:SetChecked(false)
+			ARL_ExpObtainOptCB:SetChecked(false)
+			ARL_ExpBindingOptCB:SetChecked(false)
+			ARL_ExpItemOptCB:SetChecked(false)
+			ARL_ExpRepOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
---			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:White( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
+--			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:White(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Hide()
 			addon.Fly_Obtain:Hide()
@@ -2076,24 +2148,24 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
 			ChangeFilters = false
 		end
-	elseif ( panel == 6 ) then
-		if ( ARL_ExpRepOptCB:GetChecked() ) then
+	elseif (panel == 6) then
+		if (ARL_ExpRepOptCB:GetChecked()) then
 			-- uncheck all other buttons
-			ARL_ExpGeneralOptCB:SetChecked( false )
-			ARL_ExpObtainOptCB:SetChecked( false )
-			ARL_ExpBindingOptCB:SetChecked( false )
-			ARL_ExpItemOptCB:SetChecked( false )
-			ARL_ExpPlayerOptCB:SetChecked( false )
+			ARL_ExpGeneralOptCB:SetChecked(false)
+			ARL_ExpObtainOptCB:SetChecked(false)
+			ARL_ExpBindingOptCB:SetChecked(false)
+			ARL_ExpItemOptCB:SetChecked(false)
+			ARL_ExpPlayerOptCB:SetChecked(false)
 			-- change text colors to match selection
-			ARL_ExpGeneralOptCB.text:SetText( addon:Yellow( ExpButtonText[1] ) )
-			ARL_ExpObtainOptCB.text:SetText( addon:Yellow( ExpButtonText[2] ) )
-			ARL_ExpBindingOptCB.text:SetText( addon:Yellow( ExpButtonText[3] ) )
---			ARL_ExpItemOptCB.text:SetText( addon:Yellow( ExpButtonText[4] ) )
-			ARL_ExpPlayerOptCB.text:SetText( addon:Yellow( ExpButtonText[5] ) )
-			ARL_ExpRepOptCB.text:SetText( addon:White( ExpButtonText[6] ) )
+			ARL_ExpGeneralOptCB.text:SetText(addon:Yellow(ExpButtonText[1]))
+			ARL_ExpObtainOptCB.text:SetText(addon:Yellow(ExpButtonText[2]))
+			ARL_ExpBindingOptCB.text:SetText(addon:Yellow(ExpButtonText[3]))
+--			ARL_ExpItemOptCB.text:SetText(addon:Yellow(ExpButtonText[4]))
+			ARL_ExpPlayerOptCB.text:SetText(addon:Yellow(ExpButtonText[5]))
+			ARL_ExpRepOptCB.text:SetText(addon:White(ExpButtonText[6]))
 			-- display the correct subframe with all the buttons and such, hide the others
 			addon.Fly_General:Hide()
 			addon.Fly_Obtain:Hide()
@@ -2104,28 +2176,28 @@ function addon.DoFlyaway( panel )

 			ChangeFilters = true
 		else
-			ARL_ExpRepOptCB.text:SetText( addon:Yellow( ExpButtonText[6] ) )
+			ARL_ExpRepOptCB.text:SetText(addon:Yellow(ExpButtonText[6]))
 			ChangeFilters = false
 		end
 	end

-	if ( ChangeFilters == true ) then
+	if (ChangeFilters == true) then
 		-- Depending on which panel we're showing, either display one column
 		-- or two column
-		if ( ( panel == 3 ) or ( panel == 4 ) ) then
+		if ((panel == 3) or (panel == 4)) then
 			addon.flyTexture:ClearAllPoints()
 			addon.Flyaway:SetWidth(234)
 			addon.Flyaway:SetHeight(312)
-			addon.flyTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\fly_2col]] )
-			addon.flyTexture:SetAllPoints( addon.Flyaway )
-			addon.flyTexture:SetTexCoord( 0, (234/256), 0, (312/512) )
-		elseif ( ( panel == 1 ) or ( panel == 2 ) or ( panel == 5 ) or ( panel == 6 ) ) then
+			addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_2col]])
+			addon.flyTexture:SetAllPoints(addon.Flyaway)
+			addon.flyTexture:SetTexCoord(0, (234/256), 0, (312/512))
+		elseif ((panel == 1) or (panel == 2) or (panel == 5) or (panel == 6)) then
 			addon.flyTexture:ClearAllPoints()
 			addon.Flyaway:SetWidth(136)
 			addon.Flyaway:SetHeight(312)
-			addon.flyTexture:SetTexture( [[Interface\Addons\AckisRecipeList\img\fly_1col]] )
-			addon.flyTexture:SetAllPoints( addon.Flyaway )
-			addon.flyTexture:SetTexCoord( 0, (136/256), 0, (312/512) )
+			addon.flyTexture:SetTexture([[Interface\Addons\AckisRecipeList\img\fly_1col]])
+			addon.flyTexture:SetAllPoints(addon.Flyaway)
+			addon.flyTexture:SetTexCoord(0, (136/256), 0, (312/512))
 		end
 		-- Change the filters to the current panel
 		addon.Flyaway:Show()
@@ -2144,33 +2216,33 @@ function initDisplayStrings()
 	local insertIndex = 1
 	for i = 1, #sortedRecipeIndex do
 		local recipeIndex = sortedRecipeIndex[i]
-		if ( ( recipeDB[recipeIndex]["Display"] == true ) and
-			 ( recipeDB[recipeIndex]["Search"] == true ) ) then
+		if ((recipeDB[recipeIndex]["Display"] == true) and
+			 (recipeDB[recipeIndex]["Search"] == true)) then
 			local t = {}
 			-- add in recipe difficulty coloring
 			local recStr = ""
-			if ( exclude[recipeIndex] == true ) then
+			if (exclude[recipeIndex] == true) then
 				recStr = "** " .. recipeDB[recipeIndex]["Name"] .. " **"
 			else
 				recStr = recipeDB[recipeIndex]["Name"]
 			end
 			local recipeSkill = recipeDB[recipeIndex]["Level"]
 			local playerSkill = playerData.playerProfessionLevel
-			if ( recipeSkill > playerSkill ) then
-				t.String = addon:Red( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 20 ) then
-				t.String = addon:Orange( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 30 ) then
-				t.String = addon:Yellow( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 40 ) then
-				t.String = addon:Green( recStr )
+			if (recipeSkill > playerSkill) then
+				t.String = addon:Red(recStr)
+			elseif ((playerSkill - recipeSkill) < 20) then
+				t.String = addon:Orange(recStr)
+			elseif ((playerSkill - recipeSkill) < 30) then
+				t.String = addon:Yellow(recStr)
+			elseif ((playerSkill - recipeSkill) < 40) then
+				t.String = addon:Green(recStr)
 			else
-				t.String = addon:MidGrey( recStr )
+				t.String = addon:MidGrey(recStr)
 			end
 			t.sID = recipeIndex
 			t.IsRecipe = true
 			t.IsExpanded = false
-			tinsert( DisplayStrings, insertIndex, t )
+			tinsert(DisplayStrings, insertIndex, t)
 			insertIndex = insertIndex + 1
 		end
 	end
@@ -2178,63 +2250,63 @@ end

 -- This does an initial fillup of the DisplayStrings, as above.
 -- However, in this case, it expands every recipe
-function expandallDisplayStrings( )
+function expandallDisplayStrings()
 	local exclude = addon.db.profile.exclusionlist
 	DisplayStrings = nil
 	DisplayStrings = {}
 	local insertIndex = 1
 	for i = 1, #sortedRecipeIndex do
 		local recipeIndex = sortedRecipeIndex[i]
-		if ( ( recipeDB[recipeIndex]["Display"] == true ) and
-			 ( recipeDB[recipeIndex]["Search"] == true ) ) then
+		if ((recipeDB[recipeIndex]["Display"] == true) and
+			 (recipeDB[recipeIndex]["Search"] == true)) then
 			local t = {}
 			-- add in recipe difficulty coloring
 			local recStr = ""
-			if ( exclude[recipeIndex] == true ) then
+			if (exclude[recipeIndex] == true) then
 				recStr = "** " .. recipeDB[recipeIndex]["Name"] .. " **"
 			else
 				recStr = recipeDB[recipeIndex]["Name"]
 			end
 			local recipeSkill = recipeDB[recipeIndex]["Level"]
 			local playerSkill = playerData.playerProfessionLevel
-			if ( recipeSkill > playerSkill ) then
-				t.String = addon:Red( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 20 ) then
-				t.String = addon:Orange( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 30 ) then
-				t.String = addon:Yellow( recStr )
-			elseif ( ( playerSkill - recipeSkill ) < 40 ) then
-				t.String = addon:Green( recStr )
+			if (recipeSkill > playerSkill) then
+				t.String = addon:Red(recStr)
+			elseif ((playerSkill - recipeSkill) < 20) then
+				t.String = addon:Orange(recStr)
+			elseif ((playerSkill - recipeSkill) < 30) then
+				t.String = addon:Yellow(recStr)
+			elseif ((playerSkill - recipeSkill) < 40) then
+				t.String = addon:Green(recStr)
 			else
-				t.String = addon:MidGrey( recStr )
+				t.String = addon:MidGrey(recStr)
 			end
 			t.sID = sortedRecipeIndex[i]
 			t.IsRecipe = true
-			if ( recipeDB[recipeIndex]["Acquire"] ) then
+			if (recipeDB[recipeIndex]["Acquire"]) then
 				-- we have acquire information for this. push the title entry into the strings
 				-- and start processing the acquires
 				t.IsExpanded = true
-				tinsert( DisplayStrings, insertIndex, t )
-				insertIndex = expandEntry( insertIndex )
+				tinsert(DisplayStrings, insertIndex, t)
+				insertIndex = expandEntry(insertIndex)
 			else
 				t.IsExpanded = false
-				tinsert( DisplayStrings, insertIndex, t )
+				tinsert(DisplayStrings, insertIndex, t)
 				insertIndex = insertIndex + 1
 			end
 		end
 	end
 end

-function addon.ExpandAll_Clicked( )
+function addon.ExpandAll_Clicked()
 	-- Called when the expand all button is clicked
-	if ( ARL_ExpandButton:GetText() == L["EXPANDALL"] ) then
-		ARL_ExpandButton:SetText( L["CONTRACTALL"] )
-		addon:TooltipDisplay( ARL_ExpandButton, L["CONTRACTALL_DESC"] )
-		expandallDisplayStrings( )
+	if (ARL_ExpandButton:GetText() == L["EXPANDALL"]) then
+		ARL_ExpandButton:SetText(L["CONTRACTALL"])
+		addon:TooltipDisplay(ARL_ExpandButton, L["CONTRACTALL_DESC"])
+		expandallDisplayStrings()
 	else
-		ARL_ExpandButton:SetText( L["EXPANDALL"] )
-		addon:TooltipDisplay( ARL_ExpandButton, L["EXPANDALL_DESC"] )
-		initDisplayStrings( )
+		ARL_ExpandButton:SetText(L["EXPANDALL"])
+		addon:TooltipDisplay(ARL_ExpandButton, L["EXPANDALL_DESC"])
+		initDisplayStrings()
 	end
 	RecipeList_Update()
 end
@@ -2250,7 +2322,7 @@ function addon:CreateFrame(
 	qList,		-- QuestList
 	rList,		-- ReputationList
 	sList,		-- SeasonalList
-	mList )		-- MobList
+	mList)		-- MobList

 --[[
 	cPlayer is a table containing:
@@ -2264,7 +2336,7 @@ function addon:CreateFrame(
 		["Reputation"] == Reputation levels, what I had in current ARLform was if you didn't have the rep level, it would display it in red
 --]]

-	myFaction = UnitFactionGroup( "player" )
+	myFaction = UnitFactionGroup("player")
 	local HonorHold_Thrallmar_FactionText = ""
 	local Kurenai_Maghar_FactionText = ""
 	-- Values forthe progressbar (defaults)
@@ -2288,16 +2360,16 @@ function addon:CreateFrame(
 	DisplayStrings = {}

 	-- get our current profession's index
-	for k, v in pairs( SortedProfessions ) do
-		if ( v.name == currentProfession ) then
+	for k, v in pairs(SortedProfessions) do
+		if (v.name == currentProfession) then
 			currentProfIndex = k
 			break
 		end
 	end

 	-- Adding a check in to see if we're Horde or Alliance, and change the displayed reputation
-	-- strings to be faction correct (eg, Honor Hold / Thrallmar )
-	if ( myFaction == "Alliance" ) then
+	-- strings to be faction correct (eg, Honor Hold / Thrallmar)
+	if (myFaction == "Alliance") then
 		HonorHold_Thrallmar_FactionText = BFAC["Honor Hold"]
 		Kurenai_Maghar_FactionText = BFAC["Kurenai"]
 	else
@@ -2314,12 +2386,12 @@ function addon:CreateFrame(
 		addon.Frame:SetWidth(293)
 		addon.Frame:SetHeight(447)

-		addon.bgTexture = addon.Frame:CreateTexture( "AckisRecipeList.bgTexture", "ARTWORK" )
-		addon.bgTexture:SetTexture( "Interface\\Addons\\AckisRecipeList\\img\\main" )
-		addon.bgTexture:SetAllPoints( addon.Frame )
-		addon.bgTexture:SetTexCoord( 0, (293/512), 0, (447/512) )
-		addon.Frame:SetFrameStrata( "BACKGROUND" )
-		addon.Frame:SetHitRectInsets( 5, 5, 5, 5 )
+		addon.bgTexture = addon.Frame:CreateTexture("AckisRecipeList.bgTexture", "ARTWORK")
+		addon.bgTexture:SetTexture("Interface\\Addons\\AckisRecipeList\\img\\main")
+		addon.bgTexture:SetAllPoints(addon.Frame)
+		addon.bgTexture:SetTexCoord(0, (293/512), 0, (447/512))
+		addon.Frame:SetFrameStrata("BACKGROUND")
+		addon.Frame:SetHitRectInsets(5, 5, 5, 5)

 		addon.Frame:EnableMouse(true)
 		addon.Frame:EnableKeyboard(true)
@@ -2333,63 +2405,63 @@ function addon:CreateFrame(
 		addon.Frame:Show()
 		addon.Frame._Expanded = false

-		addon.Frame.HeadingText = addon.Frame:CreateFontString( "addon.Frame.HeadingText", "ARTWORK" )
+		addon.Frame.HeadingText = addon.Frame:CreateFontString("addon.Frame.HeadingText", "ARTWORK")

-		addon.Frame.HeadingText:SetFontObject( "GameFontHighlightSmall" )
+		addon.Frame.HeadingText:SetFontObject("GameFontHighlightSmall")
 		addon.Frame.HeadingText:ClearAllPoints()
 		addon.Frame.HeadingText:SetPoint("TOP", addon.Frame, "TOP", 20, -16)
-		addon.Frame.HeadingText:SetJustifyH( "CENTER" )
+		addon.Frame.HeadingText:SetJustifyH("CENTER")

-		local ARL_SwitcherButton = CreateFrame( "Button", "ARL_SwitcherButton", addon.Frame, "UIPanelButtonTemplate" )
-			ARL_SwitcherButton:SetWidth( 64 )
-			ARL_SwitcherButton:SetHeight( 64 )
-			ARL_SwitcherButton:SetPoint( "TOPLEFT", addon.Frame, "TOPLEFT", 1, -2 )
-			ARL_SwitcherButton:SetScript( "OnClick", function()
-				addon.SwitchProfs( cPlayer )
-			end )
+		local ARL_SwitcherButton = CreateFrame("Button", "ARL_SwitcherButton", addon.Frame, "UIPanelButtonTemplate")
+			ARL_SwitcherButton:SetWidth(64)
+			ARL_SwitcherButton:SetHeight(64)
+			ARL_SwitcherButton:SetPoint("TOPLEFT", addon.Frame, "TOPLEFT", 1, -2)
+			ARL_SwitcherButton:SetScript("OnClick", function()
+				addon.SwitchProfs(cPlayer)
+			end)

 		-- Stuff in the non-expanded frame (or both)
-		local ARL_CloseXButton = CreateFrame( "Button", "ARL_CloseXButton", addon.Frame, "UIPanelCloseButton" )
-			ARL_CloseXButton:SetFrameLevel( 5 )
-			ARL_CloseXButton:SetScript( "OnClick",
+		local ARL_CloseXButton = CreateFrame("Button", "ARL_CloseXButton", addon.Frame, "UIPanelCloseButton")
+			ARL_CloseXButton:SetFrameLevel(5)
+			ARL_CloseXButton:SetScript("OnClick",
 				function(this)
 					this:GetParent():Hide()
 				end
 			)
-			ARL_CloseXButton:SetPoint( "TOPRIGHT", addon.Frame, "TOPRIGHT", 5, -6 )
+			ARL_CloseXButton:SetPoint("TOPRIGHT", addon.Frame, "TOPRIGHT", 5, -6)

-		local ARL_FilterButton = addon:GenericCreateButton( "ARL_FilterButton", addon.Frame,
+		local ARL_FilterButton = addon:GenericCreateButton("ARL_FilterButton", addon.Frame,
 			25, 90, "TOPRIGHT", addon.Frame, "TOPRIGHT", -8, -40, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["FILTER_OPEN"], "CENTER", L["FILTER_OPEN_DESC"], 1 )
-			ARL_FilterButton:SetScript( "OnClick", addon.ToggleFilters )
+			"GameFontHighlightSmall", L["FILTER_OPEN"], "CENTER", L["FILTER_OPEN_DESC"], 1)
+			ARL_FilterButton:SetScript("OnClick", addon.ToggleFilters)

-		local ARL_SortButton = addon:GenericCreateButton( "ARL_SortButton", addon.Frame,
+		local ARL_SortButton = addon:GenericCreateButton("ARL_SortButton", addon.Frame,
 			25, 90, "TOPLEFT", addon.Frame, "TOPLEFT", 80, -40, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["Sorting"], "CENTER", L["SORTING_DESC"], 1 )
+			"GameFontHighlightSmall", L["Sorting"], "CENTER", L["SORTING_DESC"], 1)
 			-- Disable until we have sorting figured out
 			ARL_SortButton:Disable()

-		local ARL_ExpandButton = addon:GenericCreateButton( "ARL_ExpandButton", addon.Frame,
+		local ARL_ExpandButton = addon:GenericCreateButton("ARL_ExpandButton", addon.Frame,
 			21, 40, "TOPRIGHT", ARL_SortButton, "BOTTOMLEFT", -26, -6, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["EXPANDALL"], "CENTER", L["EXPANDALL_DESC"], 1 )
-			ARL_ExpandButton:SetScript( "OnClick", addon.ExpandAll_Clicked )
+			"GameFontHighlightSmall", L["EXPANDALL"], "CENTER", L["EXPANDALL_DESC"], 1)
+			ARL_ExpandButton:SetScript("OnClick", addon.ExpandAll_Clicked)

-		local ARL_SearchButton = addon:GenericCreateButton( "ARL_SearchButton", addon.Frame,
+		local ARL_SearchButton = addon:GenericCreateButton("ARL_SearchButton", addon.Frame,
 			25, 74, "TOPLEFT", ARL_SortButton, "BOTTOMRIGHT", 41, -2, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["Search"], "CENTER", L["SEARCH_DESC"], 1 )
+			"GameFontHighlightSmall", L["Search"], "CENTER", L["SEARCH_DESC"], 1)
 			-- Disable this until searching is working
 			ARL_SearchButton:Disable()

-		local ARL_ClearButton = addon:GenericCreateButton( "ARL_ClearButton", addon.Frame,
+		local ARL_ClearButton = addon:GenericCreateButton("ARL_ClearButton", addon.Frame,
 			28, 28, "RIGHT", ARL_SearchButton, "LEFT", 3, -1, "GameFontNormalSmall",
-			"GameFontHighlightSmall", "", "CENTER", L["CLEAR_DESC"], 3 )
+			"GameFontHighlightSmall", "", "CENTER", L["CLEAR_DESC"], 3)
 			-- Disable this until searching is working
 			ARL_ClearButton:Disable()

-		local ARL_CloseButton = addon:GenericCreateButton( "ARL_CloseButton", addon.Frame,
+		local ARL_CloseButton = addon:GenericCreateButton("ARL_CloseButton", addon.Frame,
 			22, 69, "BOTTOMRIGHT", addon.Frame, "BOTTOMRIGHT", -4, 3, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["Close"], "CENTER", L["CLOSE_DESC"], 1 )
-			ARL_CloseButton:SetScript( "OnClick",
+			"GameFontHighlightSmall", L["Close"], "CENTER", L["CLOSE_DESC"], 1)
+			ARL_CloseButton:SetScript("OnClick",
 				function(this)
 					this:GetParent():Hide()
 				end
@@ -2404,102 +2476,102 @@ function addon:CreateFrame(
 			ARL_ProgressBar:SetStatusBarTexture("Interface\\Addons\\AckisRecipeList\\img\\progressbar")
 			ARL_ProgressBar:SetOrientation("HORIZONTAL")
 			ARL_ProgressBar:SetStatusBarColor(0.25, 0.25, 0.75)
-			ARL_ProgressBar:SetFrameStrata( "LOW" )
+			ARL_ProgressBar:SetFrameStrata("LOW")

-			ARL_ProgressBar:SetMinMaxValues( pbMin, pbMax)
-			ARL_ProgressBar:SetValue( pbCur )
+			ARL_ProgressBar:SetMinMaxValues(pbMin, pbMax)
+			ARL_ProgressBar:SetValue(pbCur)

-		local ARL_ProgressBarText = ARL_ProgressBar:CreateFontString( "ARL_ProgressBarText", "ARTWORK" )
+		local ARL_ProgressBarText = ARL_ProgressBar:CreateFontString("ARL_ProgressBarText", "ARTWORK")
 			ARL_ProgressBarText:SetWidth(194)
 			ARL_ProgressBarText:SetHeight(14)
-			ARL_ProgressBarText:SetFontObject( "GameFontHighlightSmall" )
+			ARL_ProgressBarText:SetFontObject("GameFontHighlightSmall")
 			ARL_ProgressBarText:ClearAllPoints()
-			ARL_ProgressBarText:SetPoint("CENTER", ARL_ProgressBar, "CENTER", 0, 0 )
-			ARL_ProgressBarText:SetJustifyH( "CENTER" )
- 			ARL_ProgressBarText:SetText( pbCur .. " / " .. pbMax .. " - " .. math.floor( pbCur / pbMax * 100) .. "%")
+			ARL_ProgressBarText:SetPoint("CENTER", ARL_ProgressBar, "CENTER", 0, 0)
+			ARL_ProgressBarText:SetJustifyH("CENTER")
+ 			ARL_ProgressBarText:SetText(pbCur .. " / " .. pbMax .. " - " .. math.floor(pbCur / pbMax * 100) .. "%")

 		-- I'm going to use my own tooltip for recipebuttons
-		arlTooltip = CreateFrame( "GameTooltip", "arlTooltip", nil, "GameTooltipTemplate" )
+		arlTooltip = CreateFrame("GameTooltip", "arlTooltip", nil, "GameTooltipTemplate")

 		-- The main recipe list buttons and scrollframe
 		addon.PlusListButton = {}
 		addon.RecipeListButton = {}
 		for i = 1, maxVisibleRecipes do
-			local Temp_Plus = addon:GenericCreateButton( "ARL_PlusListButton" .. i, addon.Frame,
+			local Temp_Plus = addon:GenericCreateButton("ARL_PlusListButton" .. i, addon.Frame,
 				16, 16, "TOPLEFT", addon.Frame, "TOPLEFT", 20, -100, "GameFontNormalSmall",
-				"GameFontHighlightSmall", "", "LEFT", "", 2 )
-			local Temp_Recipe = addon:GenericCreateButton( "ARL_RecipeListButton" .. i, addon.Frame,
+				"GameFontHighlightSmall", "", "LEFT", "", 2)
+			local Temp_Recipe = addon:GenericCreateButton("ARL_RecipeListButton" .. i, addon.Frame,
 				16, 224, "TOPLEFT", addon.Frame, "TOPLEFT", 37, -100, "GameFontNormalSmall",
-				"GameFontHighlightSmall", "Blort", "LEFT", "", 0 )
-			if not ( i == 1 ) then
-				Temp_Plus:SetPoint( "TOPLEFT", addon.PlusListButton[i-1], "BOTTOMLEFT", 0, 3 )
-				Temp_Recipe:SetPoint( "TOPLEFT", addon.RecipeListButton[i-1], "BOTTOMLEFT", 0, 3 )
+				"GameFontHighlightSmall", "Blort", "LEFT", "", 0)
+			if not (i == 1) then
+				Temp_Plus:SetPoint("TOPLEFT", addon.PlusListButton[i-1], "BOTTOMLEFT", 0, 3)
+				Temp_Recipe:SetPoint("TOPLEFT", addon.RecipeListButton[i-1], "BOTTOMLEFT", 0, 3)
 			end
-			Temp_Plus:SetScript( "OnClick", function ()
-				addon.RecipeItem_OnClick( i )
-			end )
-			Temp_Recipe:SetScript( "OnClick", function ()
-				addon.RecipeItem_OnClick( i )
-			end )
+			Temp_Plus:SetScript("OnClick", function ()
+				addon.RecipeItem_OnClick(i)
+			end)
+			Temp_Recipe:SetScript("OnClick", function ()
+				addon.RecipeItem_OnClick(i)
+			end)
 			addon.PlusListButton[i] = Temp_Plus
 			addon.RecipeListButton[i] = Temp_Recipe
 		end

-		local ARL_RecipeScrollFrame = CreateFrame( "ScrollFrame", "ARL_RecipeScrollFrame",
-			addon.Frame, "FauxScrollFrameTemplate" )
-		ARL_RecipeScrollFrame:SetHeight( 322 )
-		ARL_RecipeScrollFrame:SetWidth( 243 )
-		ARL_RecipeScrollFrame:SetPoint( "TOPLEFT", addon.Frame, "TOPLEFT", 20, -97 )
-		ARL_RecipeScrollFrame:SetScript( "OnVerticalScroll", function(self, arg1)
-			FauxScrollFrame_OnVerticalScroll( self, arg1, 16, RecipeList_Update )
-		end )
+		local ARL_RecipeScrollFrame = CreateFrame("ScrollFrame", "ARL_RecipeScrollFrame",
+			addon.Frame, "FauxScrollFrameTemplate")
+		ARL_RecipeScrollFrame:SetHeight(322)
+		ARL_RecipeScrollFrame:SetWidth(243)
+		ARL_RecipeScrollFrame:SetPoint("TOPLEFT", addon.Frame, "TOPLEFT", 20, -97)
+		ARL_RecipeScrollFrame:SetScript("OnVerticalScroll", function(self, arg1)
+			FauxScrollFrame_OnVerticalScroll(self, arg1, 16, RecipeList_Update)
+		end)

 		-- Stuff that appears on the main frame only when expanded

-		local ARL_ResetButton = addon:GenericCreateButton( "ARL_ResetButton", addon.Frame,
+		local ARL_ResetButton = addon:GenericCreateButton("ARL_ResetButton", addon.Frame,
 			25, 90, "TOPRIGHT", ARL_FilterButton, "BOTTOMRIGHT", 0, -2, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["Reset"], "CENTER", L["RESET_DESC"], 1 )
-			ARL_ResetButton:SetScript( "OnClick", addon.resetFilters )
+			"GameFontHighlightSmall", L["Reset"], "CENTER", L["RESET_DESC"], 1)
+			ARL_ResetButton:SetScript("OnClick", addon.resetFilters)
 			ARL_ResetButton:Hide()

-		local ARL_ApplyButton = addon:GenericCreateButton( "ARL_ApplyButton", addon.Frame,
+		local ARL_ApplyButton = addon:GenericCreateButton("ARL_ApplyButton", addon.Frame,
 			22, 69, "RIGHT", ARL_CloseButton, "LEFT", -80, 0, "GameFontNormalSmall",
-			"GameFontHighlightSmall", L["Apply"], "CENTER", L["APPLY_DESC"], 1 )
-			ARL_ApplyButton:SetScript( "OnClick", ReDisplay )
+			"GameFontHighlightSmall", L["Apply"], "CENTER", L["APPLY_DESC"], 1)
+			ARL_ApplyButton:SetScript("OnClick", ReDisplay)
 			ARL_ApplyButton:Hide()

 		-- EXPANDED : 5 buttons for opening/closing the flyaway

-		ARL_ExpGeneralOptCB = addon:CreateExpCB( "ARL_ExpGeneralOptCB", "INV_Misc_Note_06", 1 )
-		ARL_ExpGeneralOptCB:SetPoint( "TOPRIGHT", ARL_FilterButton, "BOTTOMLEFT", -1, -50 )
+		ARL_ExpGeneralOptCB = addon:CreateExpCB("ARL_ExpGeneralOptCB", "INV_Misc_Note_06", 1)
+		ARL_ExpGeneralOptCB:SetPoint("TOPRIGHT", ARL_FilterButton, "BOTTOMLEFT", -1, -50)

-		ARL_ExpObtainOptCB = addon:CreateExpCB( "ARL_ExpObtainOptCB", "Spell_Shadow_MindRot", 2 )
-		ARL_ExpObtainOptCB:SetPoint( "TOPLEFT", ARL_ExpGeneralOptCB, "BOTTOMLEFT", 0, -8 )
+		ARL_ExpObtainOptCB = addon:CreateExpCB("ARL_ExpObtainOptCB", "Spell_Shadow_MindRot", 2)
+		ARL_ExpObtainOptCB:SetPoint("TOPLEFT", ARL_ExpGeneralOptCB, "BOTTOMLEFT", 0, -8)

-		ARL_ExpBindingOptCB = addon:CreateExpCB( "ARL_ExpBindingOptCB", "INV_Belt_20", 3 )
-		ARL_ExpBindingOptCB:SetPoint( "TOPLEFT", ARL_ExpObtainOptCB, "BOTTOMLEFT", -0, -8 )
+		ARL_ExpBindingOptCB = addon:CreateExpCB("ARL_ExpBindingOptCB", "INV_Belt_20", 3)
+		ARL_ExpBindingOptCB:SetPoint("TOPLEFT", ARL_ExpObtainOptCB, "BOTTOMLEFT", -0, -8)

-		ARL_ExpItemOptCB = addon:CreateExpCB( "ARL_ExpItemOptCB", "INV_Misc_EngGizmos_19", 4 )
-		ARL_ExpItemOptCB:SetPoint( "TOPLEFT", ARL_ExpBindingOptCB, "BOTTOMLEFT", -0, -8 )
+		ARL_ExpItemOptCB = addon:CreateExpCB("ARL_ExpItemOptCB", "INV_Misc_EngGizmos_19", 4)
+		ARL_ExpItemOptCB:SetPoint("TOPLEFT", ARL_ExpBindingOptCB, "BOTTOMLEFT", -0, -8)
 		ARL_ExpItemOptCB:Disable()

-		ARL_ExpPlayerOptCB = addon:CreateExpCB( "ARL_ExpPlayerOptCB", "INV_Misc_GroupLooking", 5 )
-		ARL_ExpPlayerOptCB:SetPoint( "TOPLEFT", ARL_ExpItemOptCB, "BOTTOMLEFT", -0, -8 )
+		ARL_ExpPlayerOptCB = addon:CreateExpCB("ARL_ExpPlayerOptCB", "INV_Misc_GroupLooking", 5)
+		ARL_ExpPlayerOptCB:SetPoint("TOPLEFT", ARL_ExpItemOptCB, "BOTTOMLEFT", -0, -8)

-		ARL_ExpRepOptCB = addon:CreateExpCB( "ARL_ExpRepOptCB", "INV_Scroll_05", 6 )
-		ARL_ExpRepOptCB:SetPoint( "TOPLEFT", ARL_ExpPlayerOptCB, "BOTTOMLEFT", -0, -8 )
+		ARL_ExpRepOptCB = addon:CreateExpCB("ARL_ExpRepOptCB", "INV_Scroll_05", 6)
+		ARL_ExpRepOptCB:SetPoint("TOPLEFT", ARL_ExpPlayerOptCB, "BOTTOMLEFT", -0, -8)

 	-- Frame for the flyaway pane
 		addon.Flyaway = CreateFrame("Frame", "addon.Flyaway", addon.Frame)
 			addon.Flyaway:SetWidth(234)
 			addon.Flyaway:SetHeight(312)

-			addon.flyTexture = addon.Flyaway:CreateTexture( "AckisRecipeList.flyTexture", "ARTWORK" )
-			addon.flyTexture:SetTexture( "Interface\\Addons\\AckisRecipeList\\img\\fly_2col" )
-			addon.flyTexture:SetAllPoints( addon.Flyaway )
-			addon.flyTexture:SetTexCoord( 0, (234/256), 0, (312/512) )
-			addon.Flyaway:SetFrameStrata( "LOW" )
-			addon.Flyaway:SetHitRectInsets( 5, 5, 5, 5 )
+			addon.flyTexture = addon.Flyaway:CreateTexture("AckisRecipeList.flyTexture", "ARTWORK")
+			addon.flyTexture:SetTexture("Interface\\Addons\\AckisRecipeList\\img\\fly_2col")
+			addon.flyTexture:SetAllPoints(addon.Flyaway)
+			addon.flyTexture:SetTexCoord(0, (234/256), 0, (312/512))
+			addon.Flyaway:SetFrameStrata("LOW")
+			addon.Flyaway:SetHitRectInsets(5, 5, 5, 5)

 			addon.Flyaway:EnableMouse(true)
 			addon.Flyaway:EnableKeyboard(true)
@@ -2508,527 +2580,527 @@ function addon:CreateFrame(
 			addon.Flyaway:ClearAllPoints()
 			addon.Flyaway:SetPoint("TOPLEFT", addon.Frame, "TOPRIGHT", -6, -102)

-			addon.Flyaway:SetScript( "OnShow", addon.setFlyawayState )
+			addon.Flyaway:SetScript("OnShow", addon.setFlyawayState)
 			addon.Flyaway:Hide()

 		-- Flyaway virtual frames to group buttons/text easily (and make them easy to show/hide)

-		addon.Fly_General = CreateFrame( "Frame", "addon.Fly_General", addon.Flyaway )
-			addon.Fly_General:SetWidth( 210 )
-			addon.Fly_General:SetHeight( 280 )
-			addon.Fly_General:SetFrameStrata( "MEDIUM" )
-			addon.Fly_General:EnableMouse( true )
-			addon.Fly_General:EnableKeyboard( true )
-			addon.Fly_General:SetMovable( false )
-			addon.Fly_General:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+		addon.Fly_General = CreateFrame("Frame", "addon.Fly_General", addon.Flyaway)
+			addon.Fly_General:SetWidth(210)
+			addon.Fly_General:SetHeight(280)
+			addon.Fly_General:SetFrameStrata("MEDIUM")
+			addon.Fly_General:EnableMouse(true)
+			addon.Fly_General:EnableKeyboard(true)
+			addon.Fly_General:SetMovable(false)
+			addon.Fly_General:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_General:Hide()
---			( ) Class Specific recipes
---			( ) Craft Specialty recipes
---			( ) All skill levels
---			( ) Cross-Faction
---			( ) Known	  ( ) Unknown
-			local ARL_ClassCB = CreateFrame( "CheckButton", "ARL_ClassCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ClassCB, addon.Fly_General, L["CLASS_DESC"], 1, 1, 1, 0 )
-				ARL_ClassCBText:SetText( L["Classes"] )
-			local ARL_SpecialtyCB = CreateFrame( "CheckButton", "ARL_SpecialtyCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_SpecialtyCB, addon.Fly_General, L["SPECIALTY_DESC"], 2, 2, 1, 0 )
-				ARL_SpecialtyCBText:SetText( L["Specialties"] )
-			local ARL_LevelCB = CreateFrame( "CheckButton", "ARL_LevelCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_LevelCB, addon.Fly_General, L["SKILL_DESC"], 3, 3, 1, 0 )
-				ARL_LevelCBText:SetText( L["Skill"] )
-			local ARL_FactionCB = CreateFrame( "CheckButton", "ARL_FactionCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_FactionCB, addon.Fly_General, L["FACTION_DESC"], 4, 4, 1, 0 )
-				ARL_FactionCBText:SetText( L["Faction"] )
-			local ARL_KnownCB = CreateFrame( "CheckButton", "ARL_KnownCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_KnownCB, addon.Fly_General, L["KNOWN_DESC"], 5, 5, 1, 0 )
-				ARL_KnownCBText:SetText( L["Known"] )
-			local ARL_UnknownCB = CreateFrame( "CheckButton", "ARL_UnknownCB", addon.Fly_General, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_UnknownCB, addon.Fly_General, L["UNKNOWN_DESC"], 6, 6, 1, 0 )
-				ARL_UnknownCBText:SetText( L["Unknown"] )
-
-		addon.Fly_Obtain = CreateFrame( "Frame", "addon.Fly_Obtain", addon.Flyaway )
-			addon.Fly_Obtain:SetWidth( 210 )
-			addon.Fly_Obtain:SetHeight( 280 )
-			addon.Fly_Obtain:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Obtain:EnableMouse( true )
-			addon.Fly_Obtain:EnableKeyboard( true )
-			addon.Fly_Obtain:SetMovable( false )
-			addon.Fly_Obtain:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+--			() Class Specific recipes
+--			() Craft Specialty recipes
+--			() All skill levels
+--			() Cross-Faction
+--			() Known	  () Unknown
+			local ARL_ClassCB = CreateFrame("CheckButton", "ARL_ClassCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ClassCB, addon.Fly_General, L["CLASS_DESC"], 1, 1, 1, 0)
+				ARL_ClassCBText:SetText(L["Classes"])
+			local ARL_SpecialtyCB = CreateFrame("CheckButton", "ARL_SpecialtyCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_SpecialtyCB, addon.Fly_General, L["SPECIALTY_DESC"], 2, 2, 1, 0)
+				ARL_SpecialtyCBText:SetText(L["Specialties"])
+			local ARL_LevelCB = CreateFrame("CheckButton", "ARL_LevelCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_LevelCB, addon.Fly_General, L["SKILL_DESC"], 3, 3, 1, 0)
+				ARL_LevelCBText:SetText(L["Skill"])
+			local ARL_FactionCB = CreateFrame("CheckButton", "ARL_FactionCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_FactionCB, addon.Fly_General, L["FACTION_DESC"], 4, 4, 1, 0)
+				ARL_FactionCBText:SetText(L["Faction"])
+			local ARL_KnownCB = CreateFrame("CheckButton", "ARL_KnownCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_KnownCB, addon.Fly_General, L["KNOWN_DESC"], 5, 5, 1, 0)
+				ARL_KnownCBText:SetText(L["Known"])
+			local ARL_UnknownCB = CreateFrame("CheckButton", "ARL_UnknownCB", addon.Fly_General, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_UnknownCB, addon.Fly_General, L["UNKNOWN_DESC"], 6, 6, 1, 0)
+				ARL_UnknownCBText:SetText(L["Unknown"])
+
+		addon.Fly_Obtain = CreateFrame("Frame", "addon.Fly_Obtain", addon.Flyaway)
+			addon.Fly_Obtain:SetWidth(210)
+			addon.Fly_Obtain:SetHeight(280)
+			addon.Fly_Obtain:SetFrameStrata("MEDIUM")
+			addon.Fly_Obtain:EnableMouse(true)
+			addon.Fly_Obtain:EnableKeyboard(true)
+			addon.Fly_Obtain:SetMovable(false)
+			addon.Fly_Obtain:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_Obtain:Hide()
---			( ) Instance	( ) Raid
---			( ) Quest		( ) Seasonal
---			( ) Trainer		( ) Vendor
---			( ) PVP		( ) Discovery
---			( ) World Drop	( ) Mob Drop
-			local ARL_InstanceCB = CreateFrame( "CheckButton", "ARL_InstanceCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_InstanceCB, addon.Fly_Obtain, L["INSTANCE_DESC"], 7, 1, 1, 0 )
-				ARL_InstanceCBText:SetText( L["Instance"] )
-			local ARL_RaidCB = CreateFrame( "CheckButton", "ARL_RaidCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RaidCB, addon.Fly_Obtain, L["RAID_DESC"], 8, 2, 1, 0 )
-				ARL_RaidCBText:SetText( L["Raid"] )
-			local ARL_QuestCB = CreateFrame( "CheckButton", "ARL_QuestCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_QuestCB, addon.Fly_Obtain, L["QUEST_DESC"], 9, 3, 1, 0 )
-				ARL_QuestCBText:SetText( L["Quest"] )
-			local ARL_SeasonalCB = CreateFrame( "CheckButton", "ARL_SeasonalCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_SeasonalCB, addon.Fly_Obtain, L["SEASONAL_DESC"], 10, 4, 1, 0 )
-				ARL_SeasonalCBText:SetText( L["Seasonal"] )
-			local ARL_TrainerCB = CreateFrame( "CheckButton", "ARL_TrainerCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_TrainerCB, addon.Fly_Obtain, L["TRAINER_DESC"], 11, 5, 1, 0 )
-				ARL_TrainerCBText:SetText( L["Trainer"] )
-			local ARL_VendorCB = CreateFrame( "CheckButton", "ARL_VendorCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_VendorCB, addon.Fly_Obtain, L["VENDOR_DESC"], 12, 6, 1, 0 )
-				ARL_VendorCBText:SetText( L["Vendor"] )
-			local ARL_PVPCB = CreateFrame( "CheckButton", "ARL_PVPCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_PVPCB, addon.Fly_Obtain, L["PVP_DESC"], 13, 7, 1, 0 )
-				ARL_PVPCBText:SetText( L["PVP"] )
-			local ARL_DiscoveryCB = CreateFrame( "CheckButton", "ARL_DiscoveryCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_DiscoveryCB, addon.Fly_Obtain, L["DISCOVERY_DESC"], 14, 8, 1, 0 )
-				ARL_DiscoveryCBText:SetText( L["Discovery"] )
-			local ARL_WorldDropCB = CreateFrame( "CheckButton", "ARL_WorldDropCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WorldDropCB, addon.Fly_Obtain, L["WORLD_DROP_DESC"], 39, 9, 1, 0 )
-				ARL_WorldDropCBText:SetText( L["World Drop"] )
-			local ARL_MobDropCB = CreateFrame( "CheckButton", "ARL_MobDropCB", addon.Fly_Obtain, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_MobDropCB, addon.Fly_Obtain, L["MOB_DROP_DESC"], 40, 10, 1, 0 )
-				ARL_MobDropCBText:SetText( L["Mob Drop"] )
-
-		addon.Fly_Binding = CreateFrame( "Frame", "addon.Fly_Binding", addon.Flyaway )
-			addon.Fly_Binding:SetWidth( 210 )
-			addon.Fly_Binding:SetHeight( 280 )
-			addon.Fly_Binding:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Binding:EnableMouse( true )
-			addon.Fly_Binding:EnableKeyboard( true )
-			addon.Fly_Binding:SetMovable( false )
-			addon.Fly_Binding:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+--			() Instance	() Raid
+--			() Quest		() Seasonal
+--			() Trainer		() Vendor
+--			() PVP		() Discovery
+--			() World Drop	() Mob Drop
+			local ARL_InstanceCB = CreateFrame("CheckButton", "ARL_InstanceCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_InstanceCB, addon.Fly_Obtain, L["INSTANCE_DESC"], 7, 1, 1, 0)
+				ARL_InstanceCBText:SetText(L["Instance"])
+			local ARL_RaidCB = CreateFrame("CheckButton", "ARL_RaidCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RaidCB, addon.Fly_Obtain, L["RAID_DESC"], 8, 2, 1, 0)
+				ARL_RaidCBText:SetText(L["Raid"])
+			local ARL_QuestCB = CreateFrame("CheckButton", "ARL_QuestCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_QuestCB, addon.Fly_Obtain, L["QUEST_DESC"], 9, 3, 1, 0)
+				ARL_QuestCBText:SetText(L["Quest"])
+			local ARL_SeasonalCB = CreateFrame("CheckButton", "ARL_SeasonalCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_SeasonalCB, addon.Fly_Obtain, L["SEASONAL_DESC"], 10, 4, 1, 0)
+				ARL_SeasonalCBText:SetText(L["Seasonal"])
+			local ARL_TrainerCB = CreateFrame("CheckButton", "ARL_TrainerCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_TrainerCB, addon.Fly_Obtain, L["TRAINER_DESC"], 11, 5, 1, 0)
+				ARL_TrainerCBText:SetText(L["Trainer"])
+			local ARL_VendorCB = CreateFrame("CheckButton", "ARL_VendorCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_VendorCB, addon.Fly_Obtain, L["VENDOR_DESC"], 12, 6, 1, 0)
+				ARL_VendorCBText:SetText(L["Vendor"])
+			local ARL_PVPCB = CreateFrame("CheckButton", "ARL_PVPCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_PVPCB, addon.Fly_Obtain, L["PVP_DESC"], 13, 7, 1, 0)
+				ARL_PVPCBText:SetText(L["PVP"])
+			local ARL_DiscoveryCB = CreateFrame("CheckButton", "ARL_DiscoveryCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_DiscoveryCB, addon.Fly_Obtain, L["DISCOVERY_DESC"], 14, 8, 1, 0)
+				ARL_DiscoveryCBText:SetText(L["Discovery"])
+			local ARL_WorldDropCB = CreateFrame("CheckButton", "ARL_WorldDropCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WorldDropCB, addon.Fly_Obtain, L["WORLD_DROP_DESC"], 39, 9, 1, 0)
+				ARL_WorldDropCBText:SetText(L["World Drop"])
+			local ARL_MobDropCB = CreateFrame("CheckButton", "ARL_MobDropCB", addon.Fly_Obtain, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_MobDropCB, addon.Fly_Obtain, L["MOB_DROP_DESC"], 40, 10, 1, 0)
+				ARL_MobDropCBText:SetText(L["Mob Drop"])
+
+		addon.Fly_Binding = CreateFrame("Frame", "addon.Fly_Binding", addon.Flyaway)
+			addon.Fly_Binding:SetWidth(210)
+			addon.Fly_Binding:SetHeight(280)
+			addon.Fly_Binding:SetFrameStrata("MEDIUM")
+			addon.Fly_Binding:EnableMouse(true)
+			addon.Fly_Binding:EnableKeyboard(true)
+			addon.Fly_Binding:SetMovable(false)
+			addon.Fly_Binding:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_Binding:Hide()
---			( ) Crafted Item is Bind on Equip
---			( ) Crafted Item is Bind on Pickup
---			( ) Recipe is Bind on Equip
---			( ) Recipe is Bind on Pickup
-			local ARL_iBoECB = CreateFrame( "CheckButton", "ARL_iBoECB", addon.Fly_Binding, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_iBoECB, addon.Fly_Binding, L["BOE_DESC"], 15, 1, 1, 0 )
-				ARL_iBoECBText:SetText( L["BOEFilter"] )
-			local ARL_iBoPCB = CreateFrame( "CheckButton", "ARL_iBoPCB", addon.Fly_Binding, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_iBoPCB, addon.Fly_Binding, L["BOP_DESC"], 16, 2, 1, 0 )
-				ARL_iBoPCBText:SetText( L["BOPFilter"] )
-			local ARL_rBoECB = CreateFrame( "CheckButton", "ARL_rBoECB", addon.Fly_Binding, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_rBoECB, addon.Fly_Binding, L["RECIPE_BOE_DESC"], 17, 3, 1, 0 )
-				ARL_rBoECBText:SetText( L["RecipeBOEFilter"] )
-			local ARL_rBoPCB = CreateFrame( "CheckButton", "ARL_rBoPCB", addon.Fly_Binding, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_rBoPCB, addon.Fly_Binding, L["RECIPE_BOP_DESC"], 18, 4, 1, 0 )
-				ARL_rBoPCBText:SetText( L["RecipeBOPFilter"] )
-
-		addon.Fly_Item = CreateFrame( "Frame", "addon.Fly_Item", addon.Flyaway )
-			addon.Fly_Item:SetWidth( 210 )
-			addon.Fly_Item:SetHeight( 280 )
-			addon.Fly_Item:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Item:EnableMouse( true )
-			addon.Fly_Item:EnableKeyboard( true )
-			addon.Fly_Item:SetMovable( false )
-			addon.Fly_Item:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+--			() Crafted Item is Bind on Equip
+--			() Crafted Item is Bind on Pickup
+--			() Recipe is Bind on Equip
+--			() Recipe is Bind on Pickup
+			local ARL_iBoECB = CreateFrame("CheckButton", "ARL_iBoECB", addon.Fly_Binding, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_iBoECB, addon.Fly_Binding, L["BOE_DESC"], 15, 1, 1, 0)
+				ARL_iBoECBText:SetText(L["BOEFilter"])
+			local ARL_iBoPCB = CreateFrame("CheckButton", "ARL_iBoPCB", addon.Fly_Binding, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_iBoPCB, addon.Fly_Binding, L["BOP_DESC"], 16, 2, 1, 0)
+				ARL_iBoPCBText:SetText(L["BOPFilter"])
+			local ARL_rBoECB = CreateFrame("CheckButton", "ARL_rBoECB", addon.Fly_Binding, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_rBoECB, addon.Fly_Binding, L["RECIPE_BOE_DESC"], 17, 3, 1, 0)
+				ARL_rBoECBText:SetText(L["RecipeBOEFilter"])
+			local ARL_rBoPCB = CreateFrame("CheckButton", "ARL_rBoPCB", addon.Fly_Binding, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_rBoPCB, addon.Fly_Binding, L["RECIPE_BOP_DESC"], 18, 4, 1, 0)
+				ARL_rBoPCBText:SetText(L["RecipeBOPFilter"])
+
+		addon.Fly_Item = CreateFrame("Frame", "addon.Fly_Item", addon.Flyaway)
+			addon.Fly_Item:SetWidth(210)
+			addon.Fly_Item:SetHeight(280)
+			addon.Fly_Item:SetFrameStrata("MEDIUM")
+			addon.Fly_Item:EnableMouse(true)
+			addon.Fly_Item:EnableKeyboard(true)
+			addon.Fly_Item:SetMovable(false)
+			addon.Fly_Item:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_Item:Hide()
 --			Armor:
---				( ) All		( ) None
---				( ) Cloth	( ) Leather
---				( ) Mail	( ) Plate
+--				() All		() None
+--				() Cloth	() Leather
+--				() Mail	() Plate
 --
---				( ) Cloak	( ) Necklace
---				( ) Rings	( ) Trinkets
-			local ARL_ArmorText = addon.Fly_Item:CreateFontString( "ARL_ArmorText", "OVERLAY", "GameFontHighlight" )
-				ARL_ArmorText:SetText( L["Armor"] .. ":" )
-				ARL_ArmorText:SetPoint( "TOPLEFT", addon.Fly_Item, "TOPLEFT", 5, -8 )
-				ARL_ArmorText:SetHeight( 14 )
-				ARL_ArmorText:SetWidth( 150 )
-				ARL_ArmorText:SetJustifyH( "LEFT" )
-			local ARL_ArmorAllCB = CreateFrame( "CheckButton", "ARL_ArmorAllCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorAllCB, addon.Fly_Item, L["ARMOR_ALL_DESC"], 19, 2, 1, 0 )
-				ARL_ArmorAllCBText:SetText( L["All"] )
-			local ARL_ArmorNoneCB = CreateFrame( "CheckButton", "ARL_ArmorNoneCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorNoneCB, addon.Fly_Item, L["ARMOR_NONE_DESC"], 20, 2, 2, 0 )
-				ARL_ArmorNoneCBText:SetText( L["None"] )
-			local ARL_ArmorClothCB = CreateFrame( "CheckButton", "ARL_ArmorClothCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorClothCB, addon.Fly_Item, L["CLOTH_DESC"], 21, 3, 1, 0 )
-				ARL_ArmorClothCBText:SetText( L["Cloth"] )
-			local ARL_ArmorLeatherCB = CreateFrame( "CheckButton", "ARL_ArmorLeatherCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorLeatherCB, addon.Fly_Item, L["LEATHER_DESC"], 22, 3, 2, 0 )
-				ARL_ArmorLeatherCBText:SetText( L["Leather"] )
-			local ARL_ArmorMailCB = CreateFrame( "CheckButton", "ARL_ArmorMailCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorMailCB, addon.Fly_Item, L["MAIL_DESC"], 23, 4, 1, 0 )
-				ARL_ArmorMailCBText:SetText( L["Mail"] )
-			local ARL_ArmorPlateCB = CreateFrame( "CheckButton", "ARL_ArmorPlateCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorPlateCB, addon.Fly_Item, L["PLATE_DESC"], 24, 4, 2, 0 )
-				ARL_ArmorPlateCBText:SetText( L["Plate"] )
-
-			local ARL_ArmorCloakCB = CreateFrame( "CheckButton", "ARL_ArmorCloakCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorCloakCB, addon.Fly_Item, L["CLOAK_DESC"], 64, 5, 1, 0 )
-				ARL_ArmorCloakCBText:SetText( L["Cloak"] )
-			local ARL_ArmorNecklaceCB = CreateFrame( "CheckButton", "ARL_ArmorNecklaceCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorNecklaceCB, addon.Fly_Item, L["NECKLACE_DESC"], 65, 5, 2, 0 )
-				ARL_ArmorNecklaceCBText:SetText( L["Necklace"] )
-			local ARL_ArmorRingCB = CreateFrame( "CheckButton", "ARL_ArmorRingCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorRingCB, addon.Fly_Item, L["RING_DESC"], 66, 6, 1, 0 )
-				ARL_ArmorRingCBText:SetText( L["Ring"] )
-			local ARL_ArmorTrinketCB = CreateFrame( "CheckButton", "ARL_ArmorTrinketCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_ArmorTrinketCB, addon.Fly_Item, L["TRINKET_DESC"], 67, 6, 2, 0 )
-				ARL_ArmorTrinketCBText:SetText( L["Trinket"] )
+--				() Cloak	() Necklace
+--				() Rings	() Trinkets
+			local ARL_ArmorText = addon.Fly_Item:CreateFontString("ARL_ArmorText", "OVERLAY", "GameFontHighlight")
+				ARL_ArmorText:SetText(L["Armor"] .. ":")
+				ARL_ArmorText:SetPoint("TOPLEFT", addon.Fly_Item, "TOPLEFT", 5, -8)
+				ARL_ArmorText:SetHeight(14)
+				ARL_ArmorText:SetWidth(150)
+				ARL_ArmorText:SetJustifyH("LEFT")
+			local ARL_ArmorAllCB = CreateFrame("CheckButton", "ARL_ArmorAllCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorAllCB, addon.Fly_Item, L["ARMOR_ALL_DESC"], 19, 2, 1, 0)
+				ARL_ArmorAllCBText:SetText(L["All"])
+			local ARL_ArmorNoneCB = CreateFrame("CheckButton", "ARL_ArmorNoneCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorNoneCB, addon.Fly_Item, L["ARMOR_NONE_DESC"], 20, 2, 2, 0)
+				ARL_ArmorNoneCBText:SetText(L["None"])
+			local ARL_ArmorClothCB = CreateFrame("CheckButton", "ARL_ArmorClothCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorClothCB, addon.Fly_Item, L["CLOTH_DESC"], 21, 3, 1, 0)
+				ARL_ArmorClothCBText:SetText(L["Cloth"])
+			local ARL_ArmorLeatherCB = CreateFrame("CheckButton", "ARL_ArmorLeatherCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorLeatherCB, addon.Fly_Item, L["LEATHER_DESC"], 22, 3, 2, 0)
+				ARL_ArmorLeatherCBText:SetText(L["Leather"])
+			local ARL_ArmorMailCB = CreateFrame("CheckButton", "ARL_ArmorMailCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorMailCB, addon.Fly_Item, L["MAIL_DESC"], 23, 4, 1, 0)
+				ARL_ArmorMailCBText:SetText(L["Mail"])
+			local ARL_ArmorPlateCB = CreateFrame("CheckButton", "ARL_ArmorPlateCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorPlateCB, addon.Fly_Item, L["PLATE_DESC"], 24, 4, 2, 0)
+				ARL_ArmorPlateCBText:SetText(L["Plate"])
+
+			local ARL_ArmorCloakCB = CreateFrame("CheckButton", "ARL_ArmorCloakCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorCloakCB, addon.Fly_Item, L["CLOAK_DESC"], 64, 5, 1, 0)
+				ARL_ArmorCloakCBText:SetText(L["Cloak"])
+			local ARL_ArmorNecklaceCB = CreateFrame("CheckButton", "ARL_ArmorNecklaceCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorNecklaceCB, addon.Fly_Item, L["NECKLACE_DESC"], 65, 5, 2, 0)
+				ARL_ArmorNecklaceCBText:SetText(L["Necklace"])
+			local ARL_ArmorRingCB = CreateFrame("CheckButton", "ARL_ArmorRingCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorRingCB, addon.Fly_Item, L["RING_DESC"], 66, 6, 1, 0)
+				ARL_ArmorRingCBText:SetText(L["Ring"])
+			local ARL_ArmorTrinketCB = CreateFrame("CheckButton", "ARL_ArmorTrinketCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_ArmorTrinketCB, addon.Fly_Item, L["TRINKET_DESC"], 67, 6, 2, 0)
+				ARL_ArmorTrinketCBText:SetText(L["Trinket"])
 --			Weapon:
---				( ) All		( ) None
---				( ) 1H		( ) 2H
---				( ) Dagger	( ) Axe
---				( ) Mace	( ) Sword
---				( ) Polearm	( ) Thrown
---				( ) Bow	( ) Crossbow
---				( ) Staff
-			local ARL_WeaponText = addon.Fly_Item:CreateFontString( "ARL_WeaponText", "OVERLAY", "GameFontHighlight" )
-				ARL_WeaponText:SetText( L["Weapon"] .. ":" )
-				ARL_WeaponText:SetPoint( "TOPLEFT", addon.Fly_Item, "TOPLEFT", 5, -116 )
-				ARL_WeaponText:SetHeight( 14 )
-				ARL_WeaponText:SetWidth( 150 )
-				ARL_WeaponText:SetJustifyH( "LEFT" )
-			local ARL_WeaponAllCB = CreateFrame( "CheckButton", "ARL_WeaponAllCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponAllCB, addon.Fly_Item, L["WEAPON_ALL_DESC"], 25, 8, 1, 0 )
-				ARL_WeaponAllCBText:SetText( L["All"] )
-			local ARL_WeaponNoneCB = CreateFrame( "CheckButton", "ARL_WeaponNoneCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponNoneCB, addon.Fly_Item, L["WEAPON_NONE_DESC"], 26, 8, 2, 0 )
-				ARL_WeaponNoneCBText:SetText( L["None"] )
-			local ARL_Weapon1HCB = CreateFrame( "CheckButton", "ARL_Weapon1HCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_Weapon1HCB, addon.Fly_Item, L["ONEHAND_DESC"], 27, 9, 1, 0 )
-				ARL_Weapon1HCBText:SetText( L["One Hand"] )
-			local ARL_Weapon2HCB = CreateFrame( "CheckButton", "ARL_Weapon2HCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_Weapon2HCB, addon.Fly_Item, L["TWOHAND_DESC"], 28, 9, 2, 0 )
-				ARL_Weapon2HCBText:SetText( L["Two Hand"] )
-			local ARL_WeaponDaggerCB = CreateFrame( "CheckButton", "ARL_WeaponDaggerCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponDaggerCB, addon.Fly_Item, L["DAGGER_DESC"], 29, 10, 1, 0 )
-				ARL_WeaponDaggerCBText:SetText( L["Dagger"] )
-			local ARL_WeaponAxeCB = CreateFrame( "CheckButton", "ARL_WeaponAxeCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponAxeCB, addon.Fly_Item, L["AXE_DESC"], 30, 10, 2, 0 )
-				ARL_WeaponAxeCBText:SetText( L["Axe"] )
-			local ARL_WeaponMaceCB = CreateFrame( "CheckButton", "ARL_WeaponMaceCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponMaceCB, addon.Fly_Item, L["MACE_DESC"], 31, 11, 1, 0 )
-				ARL_WeaponMaceCBText:SetText( L["Mace"] )
-			local ARL_WeaponSwordCB = CreateFrame( "CheckButton", "ARL_WeaponSwordCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponSwordCB, addon.Fly_Item, L["SWORD_DESC"], 32, 11, 2, 0 )
-				ARL_WeaponSwordCBText:SetText( L["Sword"] )
-			local ARL_WeaponPolearmCB = CreateFrame( "CheckButton", "ARL_WeaponPolearmCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponPolearmCB, addon.Fly_Item, L["POLEARM_DESC"], 33, 12, 1, 0 )
-				ARL_WeaponPolearmCBText:SetText( L["Polearm"] )
-			local ARL_WeaponFistCB = CreateFrame( "CheckButton", "ARL_WeaponFistCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponFistCB, addon.Fly_Item, L["FIST_DESC"], 84, 12, 2, 0 )
-				ARL_WeaponFistCBText:SetText( L["Fist"] )
-
-			local ARL_WeaponStaffCB = CreateFrame( "CheckButton", "ARL_WeaponStaffCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponStaffCB, addon.Fly_Item, L["STAFF_DESC"], 34, 13, 1, 0 )
-				ARL_WeaponStaffCBText:SetText( L["Staff"] )
+--				() All		() None
+--				() 1H		() 2H
+--				() Dagger	() Axe
+--				() Mace	() Sword
+--				() Polearm	() Thrown
+--				() Bow	() Crossbow
+--				() Staff
+			local ARL_WeaponText = addon.Fly_Item:CreateFontString("ARL_WeaponText", "OVERLAY", "GameFontHighlight")
+				ARL_WeaponText:SetText(L["Weapon"] .. ":")
+				ARL_WeaponText:SetPoint("TOPLEFT", addon.Fly_Item, "TOPLEFT", 5, -116)
+				ARL_WeaponText:SetHeight(14)
+				ARL_WeaponText:SetWidth(150)
+				ARL_WeaponText:SetJustifyH("LEFT")
+			local ARL_WeaponAllCB = CreateFrame("CheckButton", "ARL_WeaponAllCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponAllCB, addon.Fly_Item, L["WEAPON_ALL_DESC"], 25, 8, 1, 0)
+				ARL_WeaponAllCBText:SetText(L["All"])
+			local ARL_WeaponNoneCB = CreateFrame("CheckButton", "ARL_WeaponNoneCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponNoneCB, addon.Fly_Item, L["WEAPON_NONE_DESC"], 26, 8, 2, 0)
+				ARL_WeaponNoneCBText:SetText(L["None"])
+			local ARL_Weapon1HCB = CreateFrame("CheckButton", "ARL_Weapon1HCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_Weapon1HCB, addon.Fly_Item, L["ONEHAND_DESC"], 27, 9, 1, 0)
+				ARL_Weapon1HCBText:SetText(L["One Hand"])
+			local ARL_Weapon2HCB = CreateFrame("CheckButton", "ARL_Weapon2HCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_Weapon2HCB, addon.Fly_Item, L["TWOHAND_DESC"], 28, 9, 2, 0)
+				ARL_Weapon2HCBText:SetText(L["Two Hand"])
+			local ARL_WeaponDaggerCB = CreateFrame("CheckButton", "ARL_WeaponDaggerCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponDaggerCB, addon.Fly_Item, L["DAGGER_DESC"], 29, 10, 1, 0)
+				ARL_WeaponDaggerCBText:SetText(L["Dagger"])
+			local ARL_WeaponAxeCB = CreateFrame("CheckButton", "ARL_WeaponAxeCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponAxeCB, addon.Fly_Item, L["AXE_DESC"], 30, 10, 2, 0)
+				ARL_WeaponAxeCBText:SetText(L["Axe"])
+			local ARL_WeaponMaceCB = CreateFrame("CheckButton", "ARL_WeaponMaceCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponMaceCB, addon.Fly_Item, L["MACE_DESC"], 31, 11, 1, 0)
+				ARL_WeaponMaceCBText:SetText(L["Mace"])
+			local ARL_WeaponSwordCB = CreateFrame("CheckButton", "ARL_WeaponSwordCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponSwordCB, addon.Fly_Item, L["SWORD_DESC"], 32, 11, 2, 0)
+				ARL_WeaponSwordCBText:SetText(L["Sword"])
+			local ARL_WeaponPolearmCB = CreateFrame("CheckButton", "ARL_WeaponPolearmCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponPolearmCB, addon.Fly_Item, L["POLEARM_DESC"], 33, 12, 1, 0)
+				ARL_WeaponPolearmCBText:SetText(L["Polearm"])
+			local ARL_WeaponFistCB = CreateFrame("CheckButton", "ARL_WeaponFistCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponFistCB, addon.Fly_Item, L["FIST_DESC"], 84, 12, 2, 0)
+				ARL_WeaponFistCBText:SetText(L["Fist"])
+
+			local ARL_WeaponStaffCB = CreateFrame("CheckButton", "ARL_WeaponStaffCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponStaffCB, addon.Fly_Item, L["STAFF_DESC"], 34, 13, 1, 0)
+				ARL_WeaponStaffCBText:SetText(L["Staff"])
 				-- Disabled for now...
-				ARL_WeaponStaffCBText:SetText( addon:Grey( L["Staff"] ) )
+				ARL_WeaponStaffCBText:SetText(addon:Grey(L["Staff"]))
 				ARL_WeaponStaffCB:Disable()
-			local ARL_WeaponWandCB = CreateFrame( "CheckButton", "ARL_WeaponWandCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponWandCB, addon.Fly_Item, L["WAND_DESC"], 68, 13, 2, 0 )
-				ARL_WeaponWandCBText:SetText( L["Wand"] )
-			local ARL_WeaponThrownCB = CreateFrame( "CheckButton", "ARL_WeaponThrownCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponThrownCB, addon.Fly_Item, L["THROWN_DESC"], 35, 14, 1, 0 )
-				ARL_WeaponThrownCBText:SetText( L["Thrown"] )
-			local ARL_WeaponBowCB = CreateFrame( "CheckButton", "ARL_WeaponBowCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponBowCB, addon.Fly_Item, L["BOW_DESC"], 36, 14, 2, 0 )
-				ARL_WeaponBowCBText:SetText( L["Bow"] )
+			local ARL_WeaponWandCB = CreateFrame("CheckButton", "ARL_WeaponWandCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponWandCB, addon.Fly_Item, L["WAND_DESC"], 68, 13, 2, 0)
+				ARL_WeaponWandCBText:SetText(L["Wand"])
+			local ARL_WeaponThrownCB = CreateFrame("CheckButton", "ARL_WeaponThrownCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponThrownCB, addon.Fly_Item, L["THROWN_DESC"], 35, 14, 1, 0)
+				ARL_WeaponThrownCBText:SetText(L["Thrown"])
+			local ARL_WeaponBowCB = CreateFrame("CheckButton", "ARL_WeaponBowCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponBowCB, addon.Fly_Item, L["BOW_DESC"], 36, 14, 2, 0)
+				ARL_WeaponBowCBText:SetText(L["Bow"])
 				-- Disabled for now...
-				ARL_WeaponBowCBText:SetText( addon:Grey( L["Bow"] ) )
+				ARL_WeaponBowCBText:SetText(addon:Grey(L["Bow"]))
 				ARL_WeaponBowCB:Disable()
-			local ARL_WeaponCrossbowCB = CreateFrame( "CheckButton", "ARL_WeaponCrossbowCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponCrossbowCB, addon.Fly_Item, L["CROSSBOW_DESC"], 37, 15, 1, 0 )
-				ARL_WeaponCrossbowCBText:SetText( L["Crossbow"] )
+			local ARL_WeaponCrossbowCB = CreateFrame("CheckButton", "ARL_WeaponCrossbowCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponCrossbowCB, addon.Fly_Item, L["CROSSBOW_DESC"], 37, 15, 1, 0)
+				ARL_WeaponCrossbowCBText:SetText(L["Crossbow"])
 				-- Disabled for now...
-				ARL_WeaponCrossbowCBText:SetText( addon:Grey( L["Crossbow"] ) )
+				ARL_WeaponCrossbowCBText:SetText(addon:Grey(L["Crossbow"]))
 				ARL_WeaponCrossbowCB:Disable()
-			local ARL_WeaponAmmoCB = CreateFrame( "CheckButton", "ARL_WeaponAmmoCB", addon.Fly_Item, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_WeaponAmmoCB, addon.Fly_Item, L["AMMO_DESC"], 38, 15, 2, 0 )
-				ARL_WeaponAmmoCBText:SetText( L["Ammo"] )
-
-		addon.Fly_Player= CreateFrame( "Frame", "addon.Fly_Player", addon.Flyaway )
-			addon.Fly_Player:SetWidth( 112 )
-			addon.Fly_Player:SetHeight( 280 )
-			addon.Fly_Player:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Player:EnableMouse( true )
-			addon.Fly_Player:EnableKeyboard( true )
-			addon.Fly_Player:SetMovable( false )
-			addon.Fly_Player:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+			local ARL_WeaponAmmoCB = CreateFrame("CheckButton", "ARL_WeaponAmmoCB", addon.Fly_Item, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_WeaponAmmoCB, addon.Fly_Item, L["AMMO_DESC"], 38, 15, 2, 0)
+				ARL_WeaponAmmoCBText:SetText(L["Ammo"])
+
+		addon.Fly_Player= CreateFrame("Frame", "addon.Fly_Player", addon.Flyaway)
+			addon.Fly_Player:SetWidth(112)
+			addon.Fly_Player:SetHeight(280)
+			addon.Fly_Player:SetFrameStrata("MEDIUM")
+			addon.Fly_Player:EnableMouse(true)
+			addon.Fly_Player:EnableKeyboard(true)
+			addon.Fly_Player:SetMovable(false)
+			addon.Fly_Player:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_Player:Hide()
---			( ) Tank	  ( ) Melee DPS
---			( ) Healer	  ( ) Caster DPS
-			local ARL_PlayerTankCB = CreateFrame( "CheckButton", "ARL_PlayerTankCB", addon.Fly_Player, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_PlayerTankCB, addon.Fly_Player, L["TANKS_DESC"], 41, 1, 1, 0 )
-				ARL_PlayerTankCBText:SetText( L["Tanks"] )
-			local ARL_PlayerMeleeCB = CreateFrame( "CheckButton", "ARL_PlayerMeleeCB", addon.Fly_Player, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_PlayerMeleeCB, addon.Fly_Player, L["MELEE_DPS_DESC"], 42, 2, 1, 0 )
-				ARL_PlayerMeleeCBText:SetText( L["Melee DPS"] )
-			local ARL_PlayerHealerCB = CreateFrame( "CheckButton", "ARL_PlayerHealerCB", addon.Fly_Player, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_PlayerHealerCB, addon.Fly_Player, L["HEALERS_DESC"], 43, 3, 1, 0 )
-				ARL_PlayerHealerCBText:SetText( L["Healers"] )
-			local ARL_PlayerCasterCB = CreateFrame( "CheckButton", "ARL_PlayerCasterCB", addon.Fly_Player, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_PlayerCasterCB, addon.Fly_Player, L["CASTER_DPS_DESC"], 44, 4, 1, 0 )
-				ARL_PlayerCasterCBText:SetText( L["Caster DPS"] )
-
-		addon.Fly_Rep = CreateFrame( "Frame", "addon.Fly_Rep", addon.Flyaway )
-			addon.Fly_Rep:SetWidth( 112 )
-			addon.Fly_Rep:SetHeight( 280 )
-			addon.Fly_Rep:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Rep:EnableMouse( true )
-			addon.Fly_Rep:EnableKeyboard( true )
-			addon.Fly_Rep:SetMovable( false )
-			addon.Fly_Rep:SetPoint( "TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16 )
+--			() Tank	  () Melee DPS
+--			() Healer	  () Caster DPS
+			local ARL_PlayerTankCB = CreateFrame("CheckButton", "ARL_PlayerTankCB", addon.Fly_Player, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_PlayerTankCB, addon.Fly_Player, L["TANKS_DESC"], 41, 1, 1, 0)
+				ARL_PlayerTankCBText:SetText(L["Tanks"])
+			local ARL_PlayerMeleeCB = CreateFrame("CheckButton", "ARL_PlayerMeleeCB", addon.Fly_Player, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_PlayerMeleeCB, addon.Fly_Player, L["MELEE_DPS_DESC"], 42, 2, 1, 0)
+				ARL_PlayerMeleeCBText:SetText(L["Melee DPS"])
+			local ARL_PlayerHealerCB = CreateFrame("CheckButton", "ARL_PlayerHealerCB", addon.Fly_Player, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_PlayerHealerCB, addon.Fly_Player, L["HEALERS_DESC"], 43, 3, 1, 0)
+				ARL_PlayerHealerCBText:SetText(L["Healers"])
+			local ARL_PlayerCasterCB = CreateFrame("CheckButton", "ARL_PlayerCasterCB", addon.Fly_Player, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_PlayerCasterCB, addon.Fly_Player, L["CASTER_DPS_DESC"], 44, 4, 1, 0)
+				ARL_PlayerCasterCBText:SetText(L["Caster DPS"])
+
+		addon.Fly_Rep = CreateFrame("Frame", "addon.Fly_Rep", addon.Flyaway)
+			addon.Fly_Rep:SetWidth(112)
+			addon.Fly_Rep:SetHeight(280)
+			addon.Fly_Rep:SetFrameStrata("MEDIUM")
+			addon.Fly_Rep:EnableMouse(true)
+			addon.Fly_Rep:EnableKeyboard(true)
+			addon.Fly_Rep:SetMovable(false)
+			addon.Fly_Rep:SetPoint("TOPLEFT", addon.Flyaway, "TOPLEFT", 17, -16)
 			addon.Fly_Rep:Hide()

-			ARL_RepOldWorldCB = addon:CreateExpCB( "ARL_RepOldWorldCB", "Glues-WoW-Logo", 1 )
-			ARL_RepOldWorldCB:SetPoint( "TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -10 )
-			ARL_RepOldWorldCB:SetScript( "OnClick", function()
-				addon.RepFilterSwitch( 1 )
-			end )
-
-			ARL_RepBCCB = addon:CreateExpCB( "ARL_RepBCCB", "GLUES-WOW-BCLOGO", 1 )
-			ARL_RepBCCB:SetPoint( "TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -60 )
-			ARL_RepBCCB:SetScript( "OnClick", function()
-				addon.RepFilterSwitch( 2 )
-			end )
-
-			ARL_RepLKCB = addon:CreateExpCB( "ARL_RepLKCB", "wotlk_logo", 1 )
-			ARL_RepLKCB:SetPoint( "TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -110 )
-			ARL_RepLKCB:SetScript( "OnClick", function()
-				addon.RepFilterSwitch( 3 )
-			end )
-
-			addon.Fly_Rep_OW= CreateFrame( "Frame", "addon.Fly_Rep_OW", addon.Fly_Rep )
-			addon.Fly_Rep_OW:SetWidth( 150 )
-			addon.Fly_Rep_OW:SetHeight( 280 )
-			addon.Fly_Rep_OW:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Rep_OW:EnableMouse( true )
-			addon.Fly_Rep_OW:EnableKeyboard( true )
-			addon.Fly_Rep_OW:SetMovable( false )
-			addon.Fly_Rep_OW:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16 )
+			ARL_RepOldWorldCB = addon:CreateExpCB("ARL_RepOldWorldCB", "Glues-WoW-Logo", 1)
+			ARL_RepOldWorldCB:SetPoint("TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -10)
+			ARL_RepOldWorldCB:SetScript("OnClick", function()
+				addon.RepFilterSwitch(1)
+			end)
+
+			ARL_RepBCCB = addon:CreateExpCB("ARL_RepBCCB", "GLUES-WOW-BCLOGO", 1)
+			ARL_RepBCCB:SetPoint("TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -60)
+			ARL_RepBCCB:SetScript("OnClick", function()
+				addon.RepFilterSwitch(2)
+			end)
+
+			ARL_RepLKCB = addon:CreateExpCB("ARL_RepLKCB", "wotlk_logo", 1)
+			ARL_RepLKCB:SetPoint("TOPLEFT", addon.Fly_Rep, "TOPLEFT", 0, -110)
+			ARL_RepLKCB:SetScript("OnClick", function()
+				addon.RepFilterSwitch(3)
+			end)
+
+			addon.Fly_Rep_OW= CreateFrame("Frame", "addon.Fly_Rep_OW", addon.Fly_Rep)
+			addon.Fly_Rep_OW:SetWidth(150)
+			addon.Fly_Rep_OW:SetHeight(280)
+			addon.Fly_Rep_OW:SetFrameStrata("MEDIUM")
+			addon.Fly_Rep_OW:EnableMouse(true)
+			addon.Fly_Rep_OW:EnableKeyboard(true)
+			addon.Fly_Rep_OW:SetMovable(false)
+			addon.Fly_Rep_OW:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16)
 			addon.Fly_Rep_OW:Hide()
---			( ) Argent Dawn
---			( ) Cenarion Circle
---			( ) Thorium Brotherhood
---			( ) Timbermaw Hold
---			( ) Zandalar Tribe
-			local ARL_RepArgentDawnCB = CreateFrame( "CheckButton", "ARL_RepArgentDawnCB", addon.Fly_Rep_OW, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepArgentDawnCB, addon.Fly_Rep_OW,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Argent Dawn"] ), 45, 1, 1, 0 )
-				ARL_RepArgentDawnCBText:SetText( BFAC["Argent Dawn"] )
-				ARL_RepArgentDawnCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepCenarionCircleCB = CreateFrame( "CheckButton", "ARL_RepCenarionCircleCB", addon.Fly_Rep_OW, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepCenarionCircleCB, addon.Fly_Rep_OW,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Cenarion Circle"] ), 46, 2, 1, 0 )
-				ARL_RepCenarionCircleCBText:SetText( BFAC["Cenarion Circle"] )
-				ARL_RepCenarionCircleCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepThoriumCB = CreateFrame( "CheckButton", "ARL_RepThoriumCB", addon.Fly_Rep_OW, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepThoriumCB, addon.Fly_Rep_OW,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Thorium Brotherhood"] ), 47, 3, 1, 0 )
-				ARL_RepThoriumCBText:SetText( BFAC["Thorium Brotherhood"] )
-				ARL_RepThoriumCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepTimbermawCB = CreateFrame( "CheckButton", "ARL_RepTimbermawCB", addon.Fly_Rep_OW, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepTimbermawCB, addon.Fly_Rep_OW,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Timbermaw Hold"] ), 48, 4, 1, 0 )
-				ARL_RepTimbermawCBText:SetText( BFAC["Timbermaw Hold"] )
-				ARL_RepTimbermawCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepZandalarCB = CreateFrame( "CheckButton", "ARL_RepZandalarCB", addon.Fly_Rep_OW, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepZandalarCB, addon.Fly_Rep_OW,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Zandalar Tribe"] ), 49, 5, 1, 0 )
-				ARL_RepZandalarCBText:SetText( BFAC["Zandalar Tribe"] )
-				ARL_RepZandalarCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-
-			addon.Fly_Rep_BC= CreateFrame( "Frame", "addon.Fly_Rep_BC", addon.Fly_Rep )
-			addon.Fly_Rep_BC:SetWidth( 150 )
-			addon.Fly_Rep_BC:SetHeight( 280 )
-			addon.Fly_Rep_BC:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Rep_BC:EnableMouse( true )
-			addon.Fly_Rep_BC:EnableKeyboard( true )
-			addon.Fly_Rep_BC:SetMovable( false )
-			addon.Fly_Rep_BC:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16 )
+--			() Argent Dawn
+--			() Cenarion Circle
+--			() Thorium Brotherhood
+--			() Timbermaw Hold
+--			() Zandalar Tribe
+			local ARL_RepArgentDawnCB = CreateFrame("CheckButton", "ARL_RepArgentDawnCB", addon.Fly_Rep_OW, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepArgentDawnCB, addon.Fly_Rep_OW,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Argent Dawn"]), 45, 1, 1, 0)
+				ARL_RepArgentDawnCBText:SetText(BFAC["Argent Dawn"])
+				ARL_RepArgentDawnCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepCenarionCircleCB = CreateFrame("CheckButton", "ARL_RepCenarionCircleCB", addon.Fly_Rep_OW, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepCenarionCircleCB, addon.Fly_Rep_OW,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Cenarion Circle"]), 46, 2, 1, 0)
+				ARL_RepCenarionCircleCBText:SetText(BFAC["Cenarion Circle"])
+				ARL_RepCenarionCircleCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepThoriumCB = CreateFrame("CheckButton", "ARL_RepThoriumCB", addon.Fly_Rep_OW, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepThoriumCB, addon.Fly_Rep_OW,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Thorium Brotherhood"]), 47, 3, 1, 0)
+				ARL_RepThoriumCBText:SetText(BFAC["Thorium Brotherhood"])
+				ARL_RepThoriumCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepTimbermawCB = CreateFrame("CheckButton", "ARL_RepTimbermawCB", addon.Fly_Rep_OW, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepTimbermawCB, addon.Fly_Rep_OW,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Timbermaw Hold"]), 48, 4, 1, 0)
+				ARL_RepTimbermawCBText:SetText(BFAC["Timbermaw Hold"])
+				ARL_RepTimbermawCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepZandalarCB = CreateFrame("CheckButton", "ARL_RepZandalarCB", addon.Fly_Rep_OW, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepZandalarCB, addon.Fly_Rep_OW,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Zandalar Tribe"]), 49, 5, 1, 0)
+				ARL_RepZandalarCBText:SetText(BFAC["Zandalar Tribe"])
+				ARL_RepZandalarCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+
+			addon.Fly_Rep_BC= CreateFrame("Frame", "addon.Fly_Rep_BC", addon.Fly_Rep)
+			addon.Fly_Rep_BC:SetWidth(150)
+			addon.Fly_Rep_BC:SetHeight(280)
+			addon.Fly_Rep_BC:SetFrameStrata("MEDIUM")
+			addon.Fly_Rep_BC:EnableMouse(true)
+			addon.Fly_Rep_BC:EnableKeyboard(true)
+			addon.Fly_Rep_BC:SetMovable(false)
+			addon.Fly_Rep_BC:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16)
 			addon.Fly_Rep_BC:Hide()
---			( ) The Aldor
---			( ) Ashtongue Deathsworn
---			( ) Cenarion Expedition
---			( ) The Consortium
---			( ) Honor Hold / Thrallmar
---			( ) Keepers of Time
---			( ) Kurenai / The Mag'har
---			( ) Lower City
---			( ) The Scale of the Sands
---			( ) The Scryers
---			( ) The Sha'tar
---			( ) Shattered Sun Offensive
---			( ) Sporeggar
---			( ) The Violet Eye
-			local ARL_RepAldorCB = CreateFrame( "CheckButton", "ARL_RepAldorCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepAldorCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Aldor"] ), 50, 1, 1, 0 )
-				ARL_RepAldorCBText:SetText( BFAC["The Aldor"] )
-				ARL_RepAldorCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepAshtongueCB = CreateFrame( "CheckButton", "ARL_RepAshtongueCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepAshtongueCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Ashtongue Deathsworn"] ), 51, 2, 1, 0 )
-				ARL_RepAshtongueCBText:SetText( BFAC["Ashtongue Deathsworn"] )
-				ARL_RepAshtongueCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepCenarionExpeditionCB = CreateFrame( "CheckButton", "ARL_RepCenarionExpeditionCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepCenarionExpeditionCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Cenarion Expedition"] ), 52, 3, 1, 0 )
-				ARL_RepCenarionExpeditionCBText:SetText( BFAC["Cenarion Expedition"] )
-				ARL_RepCenarionExpeditionCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepConsortiumCB = CreateFrame( "CheckButton", "ARL_RepConsortiumCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepConsortiumCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Consortium"] ), 53, 4, 1, 0 )
-				ARL_RepConsortiumCBText:SetText( BFAC["The Consortium"] )
-				ARL_RepConsortiumCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepHonorHoldCB = CreateFrame( "CheckButton", "ARL_RepHonorHoldCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepHonorHoldCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], HonorHold_Thrallmar_FactionText ), 54, 5, 1, 0 )
-				ARL_RepHonorHoldCBText:SetText( HonorHold_Thrallmar_FactionText )
-				ARL_RepHonorHoldCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepKeepersOfTimeCB = CreateFrame( "CheckButton", "ARL_RepKeepersOfTimeCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepKeepersOfTimeCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Keepers of Time"] ), 55, 6, 1, 0 )
-				ARL_RepKeepersOfTimeCBText:SetText( BFAC["Keepers of Time"] )
-				ARL_RepKeepersOfTimeCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepKurenaiCB = CreateFrame( "CheckButton", "ARL_RepKurenaiCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepKurenaiCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], Kurenai_Maghar_FactionText ), 56, 7, 1, 0 )
-				ARL_RepKurenaiCBText:SetText( Kurenai_Maghar_FactionText )
-				ARL_RepKurenaiCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepLowerCityCB = CreateFrame( "CheckButton", "ARL_RepLowerCityCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepLowerCityCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Lower City"] ), 57, 8, 1, 0 )
-				ARL_RepLowerCityCBText:SetText( BFAC["Lower City"] )
-				ARL_RepLowerCityCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepScaleSandsCB = CreateFrame( "CheckButton", "ARL_RepScaleSandsCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepScaleSandsCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Scale of the Sands"] ), 58, 9, 1, 0 )
-				ARL_RepScaleSandsCBText:SetText( BFAC["The Scale of the Sands"] )
-				ARL_RepScaleSandsCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepScryersCB = CreateFrame( "CheckButton", "ARL_RepScryersCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepScryersCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Scryers"] ), 59, 10, 1, 0 )
-				ARL_RepScryersCBText:SetText( BFAC["The Scryers"] )
-				ARL_RepScryersCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepShatarCB = CreateFrame( "CheckButton", "ARL_RepShatarCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepShatarCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Sha'tar"] ), 60, 11, 1, 0 )
-				ARL_RepShatarCBText:SetText( BFAC["The Sha'tar"] )
-				ARL_RepShatarCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepShatteredSunCB = CreateFrame( "CheckButton", "ARL_RepShatteredSunCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepShatteredSunCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Shattered Sun Offensive"] ), 61, 12, 1, 0 )
-				ARL_RepShatteredSunCBText:SetText( BFAC["Shattered Sun Offensive"] )
-				ARL_RepShatteredSunCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepSporeggarCB = CreateFrame( "CheckButton", "ARL_RepSporeggarCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepSporeggarCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Sporeggar"] ), 62, 13, 1, 0 )
-				ARL_RepSporeggarCBText:SetText( BFAC["Sporeggar"] )
-				ARL_RepSporeggarCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepVioletEyeCB = CreateFrame( "CheckButton", "ARL_RepVioletEyeCB", addon.Fly_Rep_BC, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepVioletEyeCB, addon.Fly_Rep_BC,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Violet Eye"] ), 63, 14, 1, 0 )
-				ARL_RepVioletEyeCBText:SetText( BFAC["The Violet Eye"] )
-				ARL_RepVioletEyeCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
+--			() The Aldor
+--			() Ashtongue Deathsworn
+--			() Cenarion Expedition
+--			() The Consortium
+--			() Honor Hold / Thrallmar
+--			() Keepers of Time
+--			() Kurenai / The Mag'har
+--			() Lower City
+--			() The Scale of the Sands
+--			() The Scryers
+--			() The Sha'tar
+--			() Shattered Sun Offensive
+--			() Sporeggar
+--			() The Violet Eye
+			local ARL_RepAldorCB = CreateFrame("CheckButton", "ARL_RepAldorCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepAldorCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Aldor"]), 50, 1, 1, 0)
+				ARL_RepAldorCBText:SetText(BFAC["The Aldor"])
+				ARL_RepAldorCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepAshtongueCB = CreateFrame("CheckButton", "ARL_RepAshtongueCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepAshtongueCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Ashtongue Deathsworn"]), 51, 2, 1, 0)
+				ARL_RepAshtongueCBText:SetText(BFAC["Ashtongue Deathsworn"])
+				ARL_RepAshtongueCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepCenarionExpeditionCB = CreateFrame("CheckButton", "ARL_RepCenarionExpeditionCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepCenarionExpeditionCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Cenarion Expedition"]), 52, 3, 1, 0)
+				ARL_RepCenarionExpeditionCBText:SetText(BFAC["Cenarion Expedition"])
+				ARL_RepCenarionExpeditionCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepConsortiumCB = CreateFrame("CheckButton", "ARL_RepConsortiumCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepConsortiumCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Consortium"]), 53, 4, 1, 0)
+				ARL_RepConsortiumCBText:SetText(BFAC["The Consortium"])
+				ARL_RepConsortiumCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepHonorHoldCB = CreateFrame("CheckButton", "ARL_RepHonorHoldCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepHonorHoldCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], HonorHold_Thrallmar_FactionText), 54, 5, 1, 0)
+				ARL_RepHonorHoldCBText:SetText(HonorHold_Thrallmar_FactionText)
+				ARL_RepHonorHoldCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepKeepersOfTimeCB = CreateFrame("CheckButton", "ARL_RepKeepersOfTimeCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepKeepersOfTimeCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Keepers of Time"]), 55, 6, 1, 0)
+				ARL_RepKeepersOfTimeCBText:SetText(BFAC["Keepers of Time"])
+				ARL_RepKeepersOfTimeCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepKurenaiCB = CreateFrame("CheckButton", "ARL_RepKurenaiCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepKurenaiCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], Kurenai_Maghar_FactionText), 56, 7, 1, 0)
+				ARL_RepKurenaiCBText:SetText(Kurenai_Maghar_FactionText)
+				ARL_RepKurenaiCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepLowerCityCB = CreateFrame("CheckButton", "ARL_RepLowerCityCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepLowerCityCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Lower City"]), 57, 8, 1, 0)
+				ARL_RepLowerCityCBText:SetText(BFAC["Lower City"])
+				ARL_RepLowerCityCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepScaleSandsCB = CreateFrame("CheckButton", "ARL_RepScaleSandsCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepScaleSandsCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Scale of the Sands"]), 58, 9, 1, 0)
+				ARL_RepScaleSandsCBText:SetText(BFAC["The Scale of the Sands"])
+				ARL_RepScaleSandsCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepScryersCB = CreateFrame("CheckButton", "ARL_RepScryersCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepScryersCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Scryers"]), 59, 10, 1, 0)
+				ARL_RepScryersCBText:SetText(BFAC["The Scryers"])
+				ARL_RepScryersCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepShatarCB = CreateFrame("CheckButton", "ARL_RepShatarCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepShatarCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Sha'tar"]), 60, 11, 1, 0)
+				ARL_RepShatarCBText:SetText(BFAC["The Sha'tar"])
+				ARL_RepShatarCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepShatteredSunCB = CreateFrame("CheckButton", "ARL_RepShatteredSunCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepShatteredSunCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Shattered Sun Offensive"]), 61, 12, 1, 0)
+				ARL_RepShatteredSunCBText:SetText(BFAC["Shattered Sun Offensive"])
+				ARL_RepShatteredSunCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepSporeggarCB = CreateFrame("CheckButton", "ARL_RepSporeggarCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepSporeggarCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Sporeggar"]), 62, 13, 1, 0)
+				ARL_RepSporeggarCBText:SetText(BFAC["Sporeggar"])
+				ARL_RepSporeggarCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepVioletEyeCB = CreateFrame("CheckButton", "ARL_RepVioletEyeCB", addon.Fly_Rep_BC, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepVioletEyeCB, addon.Fly_Rep_BC,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Violet Eye"]), 63, 14, 1, 0)
+				ARL_RepVioletEyeCBText:SetText(BFAC["The Violet Eye"])
+				ARL_RepVioletEyeCBText:SetFont("Fonts\\ARIALN.TTF", 11)

 -- Everything below here is WotLK stuff. May need to be changed after beta.
-			addon.Fly_Rep_LK= CreateFrame( "Frame", "addon.Fly_Rep_LK", addon.Fly_Rep )
-			addon.Fly_Rep_LK:SetWidth( 150 )
-			addon.Fly_Rep_LK:SetHeight( 280 )
-			addon.Fly_Rep_LK:SetFrameStrata( "MEDIUM" )
-			addon.Fly_Rep_LK:EnableMouse( true )
-			addon.Fly_Rep_LK:EnableKeyboard( true )
-			addon.Fly_Rep_LK:SetMovable( false )
-			addon.Fly_Rep_LK:SetPoint( "TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16 )
+			addon.Fly_Rep_LK= CreateFrame("Frame", "addon.Fly_Rep_LK", addon.Fly_Rep)
+			addon.Fly_Rep_LK:SetWidth(150)
+			addon.Fly_Rep_LK:SetHeight(280)
+			addon.Fly_Rep_LK:SetFrameStrata("MEDIUM")
+			addon.Fly_Rep_LK:EnableMouse(true)
+			addon.Fly_Rep_LK:EnableKeyboard(true)
+			addon.Fly_Rep_LK:SetMovable(false)
+			addon.Fly_Rep_LK:SetPoint("TOPRIGHT", addon.Flyaway, "TOPRIGHT", -7, -16)
 			addon.Fly_Rep_LK:Hide()
---			( ) Argent Crusade
---			( ) Frenzyheart Tribe
---			( ) Knights of the Ebon Blade
---			( ) Kirin Tor
---			( ) The Sons of Hodir
---			( ) The Kalu'ak
---			( ) The Oracles
---			( ) The Wyrmrest Accord
---			( ) The Silver Convenant
---			( ) The Sunreavers
---			( ) Explorer's League
---			( ) Valiance Expedition
---			( ) The Hand of Vengeance
---			( ) The Taunka
---			( ) Warsong Offensive
-			local ARL_RepArgentCrusadeCB = CreateFrame( "CheckButton", "ARL_RepArgentCrusadeCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepArgentCrusadeCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Argent Crusade"] ), 69, 1, 1, 0 )
-				ARL_RepArgentCrusadeCBText:SetText( BFAC["Argent Crusade"] )
-				ARL_RepArgentCrusadeCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepFrenzyheartCB = CreateFrame( "CheckButton", "ARL_RepFrenzyheartCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepFrenzyheartCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Frenzyheart Tribe"] ), 70, 2, 1, 0 )
-				ARL_RepFrenzyheartCBText:SetText( BFAC["Frenzyheart Tribe"] )
-				ARL_RepFrenzyheartCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepEbonBladeCB = CreateFrame( "CheckButton", "ARL_RepEbonBladeCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepEbonBladeCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Knights of the Ebon Blade"] ), 71, 3, 1, 0 )
-				ARL_RepEbonBladeCBText:SetText( BFAC["Knights of the Ebon Blade"] )
-				ARL_RepEbonBladeCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepKirinTorCB = CreateFrame( "CheckButton", "ARL_RepKirinTorCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepKirinTorCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Kirin Tor"] ), 72, 4, 1, 0 )
-				ARL_RepKirinTorCBText:SetText( BFAC["Kirin Tor"] )
-				ARL_RepKirinTorCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepSonsOfHodirCB = CreateFrame( "CheckButton", "ARL_RepSonsOfHodirCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepSonsOfHodirCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Sons of Hodir"] ), 73, 5, 1, 0 )
-				ARL_RepSonsOfHodirCBText:SetText( BFAC["The Sons of Hodir"] )
-				ARL_RepSonsOfHodirCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepKaluakCB = CreateFrame( "CheckButton", "ARL_RepKaluakCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepKaluakCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Kalu'ak"] ), 74, 6, 1, 0 )
-				ARL_RepKaluakCBText:SetText( BFAC["The Kalu'ak"] )
-				ARL_RepKaluakCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepOraclesCB = CreateFrame( "CheckButton", "ARL_RepOraclesCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepOraclesCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Oracles"] ), 75, 7, 1, 0 )
-				ARL_RepOraclesCBText:SetText( BFAC["The Oracles"] )
-				ARL_RepOraclesCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepWyrmrestCB = CreateFrame( "CheckButton", "ARL_RepWyrmrestCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepWyrmrestCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Wyrmrest Accord"] ), 76, 8, 1, 0 )
-				ARL_RepWyrmrestCBText:SetText( BFAC["The Wyrmrest Accord"] )
-				ARL_RepWyrmrestCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepSilverCovenantCB = CreateFrame( "CheckButton", "ARL_RepSilverCovenantCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepSilverCovenantCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Silver Convenant"] ), 77, 9, 1, 0 )
-				ARL_RepSilverCovenantCBText:SetText( BFAC["The Silver Convenant"] )
-				ARL_RepSilverCovenantCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepSunreaversCB = CreateFrame( "CheckButton", "ARL_RepSunreaversCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepSunreaversCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Sunreavers"] ), 78, 10, 1, 0 )
-				ARL_RepSunreaversCBText:SetText( BFAC["The Sunreavers"] )
-				ARL_RepSunreaversCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepExplorersLeagueCB = CreateFrame( "CheckButton", "ARL_RepExplorersLeagueCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepExplorersLeagueCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Explorer's League"] ), 79, 11, 1, 0 )
-				ARL_RepExplorersLeagueCBText:SetText( BFAC["Explorer's League"] )
-				ARL_RepExplorersLeagueCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepValianceCB = CreateFrame( "CheckButton", "ARL_RepValianceCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepValianceCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Valiance Expedition"] ), 80, 12, 1, 0 )
-				ARL_RepValianceCBText:SetText( BFAC["Valiance Expedition"] )
-				ARL_RepValianceCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepHandOfVengeanceCB = CreateFrame( "CheckButton", "ARL_RepHandOfVengeanceCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepHandOfVengeanceCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Hand of Vengeance"] ), 81, 13, 1, 0 )
-				ARL_RepHandOfVengeanceCBText:SetText( BFAC["The Hand of Vengeance"] )
-				ARL_RepHandOfVengeanceCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepTaunkaCB = CreateFrame( "CheckButton", "ARL_RepTaunkaCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepTaunkaCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["The Taunka"] ), 82, 14, 1, 0 )
-				ARL_RepTaunkaCBText:SetText( BFAC["The Taunka"] )
-				ARL_RepTaunkaCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
-			local ARL_RepWarsongOffensiveCB = CreateFrame( "CheckButton", "ARL_RepWarsongOffensiveCB", addon.Fly_Rep_LK, "UICheckButtonTemplate" )
-				addon:GenericMakeCB( ARL_RepWarsongOffensiveCB, addon.Fly_Rep_LK,
-					string.format( L["SPECIFIC_REP_DESC"], BFAC["Warsong Offensive"] ), 83, 15, 1, 0 )
-				ARL_RepWarsongOffensiveCBText:SetText( BFAC["Warsong Offensive"] )
-				ARL_RepWarsongOffensiveCBText:SetFont( "Fonts\\ARIALN.TTF", 11 )
+--			() Argent Crusade
+--			() Frenzyheart Tribe
+--			() Knights of the Ebon Blade
+--			() Kirin Tor
+--			() The Sons of Hodir
+--			() The Kalu'ak
+--			() The Oracles
+--			() The Wyrmrest Accord
+--			() The Silver Convenant
+--			() The Sunreavers
+--			() Explorer's League
+--			() Valiance Expedition
+--			() The Hand of Vengeance
+--			() The Taunka
+--			() Warsong Offensive
+			local ARL_RepArgentCrusadeCB = CreateFrame("CheckButton", "ARL_RepArgentCrusadeCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepArgentCrusadeCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Argent Crusade"]), 69, 1, 1, 0)
+				ARL_RepArgentCrusadeCBText:SetText(BFAC["Argent Crusade"])
+				ARL_RepArgentCrusadeCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepFrenzyheartCB = CreateFrame("CheckButton", "ARL_RepFrenzyheartCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepFrenzyheartCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Frenzyheart Tribe"]), 70, 2, 1, 0)
+				ARL_RepFrenzyheartCBText:SetText(BFAC["Frenzyheart Tribe"])
+				ARL_RepFrenzyheartCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepEbonBladeCB = CreateFrame("CheckButton", "ARL_RepEbonBladeCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepEbonBladeCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Knights of the Ebon Blade"]), 71, 3, 1, 0)
+				ARL_RepEbonBladeCBText:SetText(BFAC["Knights of the Ebon Blade"])
+				ARL_RepEbonBladeCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepKirinTorCB = CreateFrame("CheckButton", "ARL_RepKirinTorCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepKirinTorCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Kirin Tor"]), 72, 4, 1, 0)
+				ARL_RepKirinTorCBText:SetText(BFAC["Kirin Tor"])
+				ARL_RepKirinTorCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepSonsOfHodirCB = CreateFrame("CheckButton", "ARL_RepSonsOfHodirCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepSonsOfHodirCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Sons of Hodir"]), 73, 5, 1, 0)
+				ARL_RepSonsOfHodirCBText:SetText(BFAC["The Sons of Hodir"])
+				ARL_RepSonsOfHodirCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepKaluakCB = CreateFrame("CheckButton", "ARL_RepKaluakCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepKaluakCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Kalu'ak"]), 74, 6, 1, 0)
+				ARL_RepKaluakCBText:SetText(BFAC["The Kalu'ak"])
+				ARL_RepKaluakCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepOraclesCB = CreateFrame("CheckButton", "ARL_RepOraclesCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepOraclesCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Oracles"]), 75, 7, 1, 0)
+				ARL_RepOraclesCBText:SetText(BFAC["The Oracles"])
+				ARL_RepOraclesCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepWyrmrestCB = CreateFrame("CheckButton", "ARL_RepWyrmrestCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepWyrmrestCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Wyrmrest Accord"]), 76, 8, 1, 0)
+				ARL_RepWyrmrestCBText:SetText(BFAC["The Wyrmrest Accord"])
+				ARL_RepWyrmrestCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepSilverCovenantCB = CreateFrame("CheckButton", "ARL_RepSilverCovenantCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepSilverCovenantCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Silver Convenant"]), 77, 9, 1, 0)
+				ARL_RepSilverCovenantCBText:SetText(BFAC["The Silver Convenant"])
+				ARL_RepSilverCovenantCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepSunreaversCB = CreateFrame("CheckButton", "ARL_RepSunreaversCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepSunreaversCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Sunreavers"]), 78, 10, 1, 0)
+				ARL_RepSunreaversCBText:SetText(BFAC["The Sunreavers"])
+				ARL_RepSunreaversCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepExplorersLeagueCB = CreateFrame("CheckButton", "ARL_RepExplorersLeagueCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepExplorersLeagueCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Explorer's League"]), 79, 11, 1, 0)
+				ARL_RepExplorersLeagueCBText:SetText(BFAC["Explorer's League"])
+				ARL_RepExplorersLeagueCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepValianceCB = CreateFrame("CheckButton", "ARL_RepValianceCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepValianceCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Valiance Expedition"]), 80, 12, 1, 0)
+				ARL_RepValianceCBText:SetText(BFAC["Valiance Expedition"])
+				ARL_RepValianceCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepHandOfVengeanceCB = CreateFrame("CheckButton", "ARL_RepHandOfVengeanceCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepHandOfVengeanceCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Hand of Vengeance"]), 81, 13, 1, 0)
+				ARL_RepHandOfVengeanceCBText:SetText(BFAC["The Hand of Vengeance"])
+				ARL_RepHandOfVengeanceCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepTaunkaCB = CreateFrame("CheckButton", "ARL_RepTaunkaCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepTaunkaCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["The Taunka"]), 82, 14, 1, 0)
+				ARL_RepTaunkaCBText:SetText(BFAC["The Taunka"])
+				ARL_RepTaunkaCBText:SetFont("Fonts\\ARIALN.TTF", 11)
+			local ARL_RepWarsongOffensiveCB = CreateFrame("CheckButton", "ARL_RepWarsongOffensiveCB", addon.Fly_Rep_LK, "UICheckButtonTemplate")
+				addon:GenericMakeCB(ARL_RepWarsongOffensiveCB, addon.Fly_Rep_LK,
+					string.format(L["SPECIFIC_REP_DESC"], BFAC["Warsong Offensive"]), 83, 15, 1, 0)
+				ARL_RepWarsongOffensiveCBText:SetText(BFAC["Warsong Offensive"])
+				ARL_RepWarsongOffensiveCBText:SetFont("Fonts\\ARIALN.TTF", 11)

 		-- Now that everything exists, populate the global filter table
 		local filterdb = addon.db.profile.filters
@@ -3129,33 +3201,33 @@ function addon:CreateFrame(
 		}
 	end
 	-- reset the scale
-	addon.Frame:SetScale( addon.db.profile.uiscale )
-	arlTooltip:SetScale ( addon.db.profile.tooltipscale )
+	addon.Frame:SetScale(addon.db.profile.uiscale)
+	arlTooltip:SetScale (addon.db.profile.tooltipscale)
 	-- We'll be in "ExpandAll" mode to start with. Make sure the button knows that:
-	ARL_ExpandButton:SetText( L["EXPANDALL"] )
-	addon:TooltipDisplay( ARL_ExpandButton, L["EXPANDALL_DESC"] )
+	ARL_ExpandButton:SetText(L["EXPANDALL"])
+	addon:TooltipDisplay(ARL_ExpandButton, L["EXPANDALL_DESC"])

 	-- Reset our addon title text
 	addon.resetTitle()
 	-- Set the texture on our switcher button correctly
-	SetSwitcherTexture( SortedProfessions[currentProfIndex].texture )
+	SetSwitcherTexture(SortedProfessions[currentProfIndex].texture)

 	-- Take our sorted list, and fill up DisplayStrings
-	initDisplayStrings( )
+	initDisplayStrings()

 	-- Update our progressbar
 	pbCur = cPlayer.foundRecipes
-	if ( addon.db.profile.includefiltered == true ) then
+	if (addon.db.profile.includefiltered == true) then
 		pbMax = cPlayer.totalRecipes
 	else
 		pbMax = cPlayer.totalRecipes - cPlayer.filteredRecipes + cPlayer.foundRecipes - cPlayer.otherRecipes
 	end
-	ARL_ProgressBar:SetMinMaxValues( pbMin, pbMax)
-	ARL_ProgressBar:SetValue( pbCur )
-	ARL_ProgressBarText:SetText( pbCur .. " / " .. pbMax .. " - " .. math.floor( pbCur / pbMax * 100) .. "%")
+	ARL_ProgressBar:SetMinMaxValues(pbMin, pbMax)
+	ARL_ProgressBar:SetValue(pbCur)
+	ARL_ProgressBarText:SetText(pbCur .. " / " .. pbMax .. " - " .. math.floor(pbCur / pbMax * 100) .. "%")

 	-- And update our scrollframe
-	RecipeList_Update( )
+	RecipeList_Update()
 	addon.Frame:Show()
 end