--- ActionBarSaver.lua.orig	2010-10-13 15:14:35.816250000 -0400
+++ ActionBarSaver.lua	2010-10-13 18:16:09.519375000 -0400
@@ -15,6 +15,9 @@
 local MAX_ACTION_BUTTONS = 144
 local POSSESSION_START = 121
 local POSSESSION_END = 132
+local screwed = {
+	["Lifeblood"] = true,
+}
 
 
 function ABS:OnInitialize()
@@ -69,11 +72,13 @@
 		set[actionID] = nil
 		
 		local type, id, subType, extraID = GetActionInfo(actionID)
+		--print("actionID", actionID, "maps to type", type, "id", id, "sub", subType, "extra/global", extraID)
 		if( type and id and ( actionID < POSSESSION_START or actionID > POSSESSION_END ) ) then
 			-- DB Format: <type>|<id>|<binding>|<name>|<extra ...>
 			-- Save a companion
 			if( type == "companion" ) then
-				set[actionID] = string.format("%s|%s|%s|%s|%s|%s", type, id, "", name, subType, extraID)
+				-- FIXME 'name' here is the name of the profile, not the name of the critter
+				set[actionID] = string.format("%s|%s|%s|%s|%s|%s", type, id, "", name, subType, extraID or "")
 			-- Save an equipment set
 			elseif( type == "equipmentset" ) then
 				set[actionID] = string.format("%s|%s|%s", type, id, "")
@@ -82,7 +87,7 @@
 				set[actionID] = string.format("%s|%d|%s|%s", type, id, "", (GetItemInfo(id)) or "")
 			-- Save a spell
 			elseif( type == "spell" and id > 0 ) then
-				local spell, rank = GetSpellName(id, BOOKTYPE_SPELL)
+				local spell, rank = GetSpellInfo(id) --GetSpellBookItemName(id, BOOKTYPE_SPELL)
 				if( spell ) then
 					set[actionID] = string.format("%s|%d|%s|%s|%s|%s", type, id, "", spell, rank or "", extraID or "")
 				end
@@ -196,7 +201,7 @@
 
 		for i=1, numSpells do
 			local index = offset + i
-			local spell, rank = GetSpellName(index, BOOKTYPE_SPELL)
+			local spell, rank = GetSpellBookItemName(index, BOOKTYPE_SPELL)
 			
 			-- This way we restore the max rank of spells
 			spellCache[spell] = index
@@ -272,12 +277,15 @@
 	-- Restore a spell
 	if( type == "spell" ) then
 		local spellName, spellRank = ...
+		if GetSpellInfo(spellName) and not screwed[spellName] then
+			PickupSpellBookItem(spellCache[spellName], BOOKTYPE_SPELL)
+		--[[
 		if( ( self.db.restoreRank or spellRank == "" ) and spellCache[spellName] ) then
 			PickupSpell(spellCache[spellName], BOOKTYPE_SPELL)
 		elseif( spellRank ~= "" and spellCache[spellName .. spellRank] ) then
 			PickupSpell(spellCache[spellName .. spellRank], BOOKTYPE_SPELL)
+		end]]
 		end
-		
 		if( GetCursorInfo() ~= type ) then
 			-- Bad restore, check if we should link at all
 			local lowerSpell = string.lower(spellName)
@@ -321,6 +329,7 @@
 		local critterName, critterType, critterID = ...
 		PickupCompanion(critterType, actionID)
 		if( GetCursorInfo() ~= "companion" ) then
+			critterName = actionID --FIXME see SaveProfile
 			table.insert(restoreErrors, string.format(L["Unable to restore companion \"%s\" to slot #%d, it does not appear to exist yet."], critterName, i))
 			ClearCursor()
 			return
@@ -392,7 +401,8 @@
 		
 	-- Profile restoring
 	elseif( cmd == "restore" and arg ~= "" ) then
-		for i=#(restoreErrors), 1, -1 do table.remove(restoreErrors, i) end
+		--for i=#(restoreErrors), 1, -1 do table.remove(restoreErrors, i) end
+		table.wipe(restoreErrors)
 				
 		if( not self.db.sets[playerClass][arg] ) then
 			self:Print(string.format(L["Cannot restore profile \"%s\", you can only restore profiles saved to your class."], arg))
@@ -434,7 +444,7 @@
 		end
 
 		self:Print(string.format(L["Errors found: %d"], #(restoreErrors)))
-		for _, text in pairs(restoreErrors) do
+		for _, text in ipairs(restoreErrors) do
 			DEFAULT_CHAT_FRAME:AddMessage(text)
 		end

85c85
<                               local spell = GetSpellInfo(id)
---
>                               local spell, rank = GetSpellName(id, BOOKTYPE_SPELL)
199c199
<                       local spell = GetSpellBookItemName(index, SpellBookFrame.bookType)
---
>                       local spell, rank = GetSpellName(index, BOOKTYPE_SPELL)
205c205
<                       --[[if( rank and rank ~= "" ) then
---
>                       if( rank and rank ~= "" ) then
207c207
<                       end]]
---
>                       end
275,279c275,279
<               --if( ( self.db.restoreRank or spellRank == "" ) and spellCache[spellName] ) then
<                       if spellCache[spellName] then PickupSpellBookItem(spellCache[spellName], BOOKTYPE_SPELL) end
<               --elseif( spellRank ~= "" and spellCache[spellName .. spellRank] ) then
<               --      PickupSpell(spellCache[spellName .. spellRank], BOOKTYPE_SPELL)
<               --end
---
>               if( ( self.db.restoreRank or spellRank == "" ) and spellCache[spellName] ) then
>                       PickupSpell(spellCache[spellName], BOOKTYPE_SPELL)
>               elseif( spellRank ~= "" and spellCache[spellName .. spellRank] ) then
>                       PickupSpell(spellCache[spellName .. spellRank], BOOKTYPE_SPELL)
>               end