Merge branch 'master' of git.wowace.com:wow/arl/mainline

diff --git a/Player.lua b/Player.lua
index 84121de..b02ae6d 100644
--- a/Player.lua
+++ b/Player.lua
@@ -107,7 +107,7 @@ function Player:HasProperRepLevel(rep_data)
 			end
 			local rep_name = private.reputation_list[rep_id].name

-			if player_rep[rep_name] and player_rep[rep_name] < rep_level then
+			if not player_rep[rep_name] or player_rep[rep_name] < rep_level then
 				has_faction = false
 			else
 				has_faction = true
diff --git a/Scanner.lua b/Scanner.lua
index 115cdd3..748cf08 100644
--- a/Scanner.lua
+++ b/Scanner.lua
@@ -714,9 +714,7 @@ do
 		local teachflag = false
 		local noteachflag = false

-		for i in pairs(recipe_list) do
-			local recipe = recipe_list[i]
-			local i_name = recipe.name
+		for spell_id, recipe in pairs(recipe_list) do
 			local train_data = recipe.acquire_data[A.TRAINER]
 			local found = false

@@ -729,16 +727,20 @@ do
 				end
 			end

-			if info[i_name] and not found then
-				tinsert(teach, i)
-				teachflag = true
+			if info[recipe.name] then
+				if not found then
+					tinsert(teach, spell_id)
+					teachflag = true

-				if not recipe:IsFlagged("common1", "TRAINER") then
-					tinsert(output, ": Trainer flag needs to be set.")
+					if not recipe:IsFlagged("common1", "TRAINER") then
+						tinsert(output, ": Trainer flag needs to be set.")
+					end
+				end
+			else
+				if found then
+					noteachflag = true
+					tinsert(noteach, spell_id)
 				end
-			elseif found then
-				noteachflag = true
-				tinsert(noteach, i)
 			end
 		end

@@ -1410,10 +1412,16 @@ do
 		elseif not item_id then
 			-- We are dealing with a recipe that does not have an item to learn it from.
 			-- Lets check the recipe flags to see if we have a data error and the item should exist
-			if not recipe:IsFlagged("common1", "RETIRED")
-				and (recipe:IsFlagged("common1", "VENDOR") or recipe:IsFlagged("common1", "INSTANCE") or recipe:IsFlagged("common1", "RAID")) then
+			if not recipe:IsFlagged("common1", "RETIRED") then
+				if (recipe:IsFlagged("common1", "VENDOR") or recipe:IsFlagged("common1", "INSTANCE") or recipe:IsFlagged("common1", "RAID")) then
 					tinsert(output, string.format("%s: %d", recipe.name, spell_id))
 					tinsert(output, "    No match found in the SPELL_TO_RECIPE_MAP table.")
+				elseif recipe:IsFlagged("common1", "TRAINER") and recipe.quality ~= private.item_qualities["COMMON"] then
+					local QS = private.item_quality_names
+
+					tinsert(output, string.format("%s: %d", recipe.name, spell_id))
+					tinsert(output, string.format("    Wrong quality: Q.%s - should be Q.COMMON.", QS[recipe.quality]))
+				end
 			end
 		end
 		ARLDatamineTT:Hide()
@@ -1981,12 +1989,7 @@ do
 			tinsert(output, string.format("    Extra Specialty: %s", recipe.specialty))
 		end

-		if recipe:IsFlagged("common1", "TRAINER") and not SPELL_TO_RECIPE_MAP[recipe.spell_id] and recipe.quality ~= private.item_qualities["COMMON"] then
-			local QS = private.item_quality_names
-
-			found_problem = true
-			tinsert(output, string.format("    Wrong quality: Q.%s - should be Q.COMMON.", QS[recipe.quality]))
-		elseif scan_data.quality ~= recipe.quality then
+		if scan_data.quality ~= recipe.quality then
 			local QS = private.item_quality_names

 			found_problem = true