diff --git a/API.lua b/API.lua
index 92434626..66150790 100644
--- a/API.lua
+++ b/API.lua
@@ -214,7 +214,10 @@ deaths = combat:GetDeaths()
 @COMMENTreturns a numeric table containing the deaths, table is ordered by first death to last death.@
 
 combatNumber = combat:GetCombatNumber()
-@COMMENTreturns the unique ID number for the combat.@
+@COMMENTreturns an ID for the combat, this number is unique among other combats.@
+
+combatId = combat:GetCombatId()
+@COMMENTreturns an ID for the combat, this number represents valid combat, it may have the same ID of a previous invalid combat.@
 
 container = combat:GetContainer ( attribute )
 @COMMENTreturns the container table for the requested attribute.@
diff --git a/API.txt b/API.txt
index 44fd8553..939b56c1 100644
--- a/API.txt
+++ b/API.txt
@@ -93,16 +93,14 @@ if formatString is nil, Format uses current format chosen on details options pan
 
 Details:GetActorsOnDamageCache()
 only usable while in combat, it returns a numeric table with all damage actors in the group (combatlog flag matching 0x00000007).
-this table can be freely sorted.
+the table is always sorted and only contains players in the raid or party.
 
 Details:GetActorsOnHealingCache()
 only usable while in combat, it returns a numeric table with all healing actors in the group (combatlog flag matching 0x00000007).
-this table can be freely sorted.
+the table is always sorted and only contains players in the raid or party.
 
 *For out of combat, energy and misc containers or get all actors even pets, enemies etc, you may use Container:SortByKey(key) and Container:ListActors().
 
-
-
 Getting a Combat Object:
 =======================================
 combat = Details:GetCurrentCombat()
@@ -119,7 +117,7 @@ returns the numeric table containing all past segments.
 
 
 
-Gettings an Actor:
+Getting an Actor:
 =======================================
 local actor = Details:GetActor (combat = "current", attribute = DETAILS_ATTRIBUTE_DAMAGE, actorname = Details.playername)
 returns the actor for the requested combat, attribute and actor name.
@@ -172,7 +170,10 @@ deaths = combat:GetDeaths()
 returns a numeric table containing the deaths, table is ordered by first death to last death.
 
 combatNumber = combat:GetCombatNumber()
-returns the unique ID number for the combat.
+returns an ID for the combat, this number is unique among other combats.
+
+combatId = combat:GetCombatId()
+returns an ID for the combat, this number represents valid combat, it may have the same ID of a previous invalid combat.
 
 container = combat:GetContainer ( attribute )
 returns the container table for the requested attribute.
@@ -212,6 +213,8 @@ returns the combat identification (see segment types).
 alternatePowerTable = combat:GetAlteranatePower()
 returns a table containing information about alternate power gains from players.
 
+
+
 --------------------------------------------------------------------
 
 Other Calls:
diff --git a/boot.lua b/boot.lua
index 0736a642..994319e4 100644
--- a/boot.lua
+++ b/boot.lua
@@ -3,9 +3,9 @@
 
 		_ = nil
 		_detalhes = LibStub("AceAddon-3.0"):NewAddon("_detalhes", "AceTimer-3.0", "AceComm-3.0", "AceSerializer-3.0", "NickTag-1.0")
-		_detalhes.build_counter = 5424
+		_detalhes.build_counter = 5439
 		_detalhes.userversion = "v7.3.5." .. _detalhes.build_counter
-		_detalhes.realversion = 129 --core version
+		_detalhes.realversion = 130 --core version
 		_detalhes.version = _detalhes.userversion .. " (core " .. _detalhes.realversion .. ")"
 		Details = _detalhes
 
diff --git a/classes/classe_damage.lua b/classes/classe_damage.lua
index e62b9dee..733fef18 100644
--- a/classes/classe_damage.lua
+++ b/classes/classe_damage.lua
@@ -311,7 +311,7 @@
 				elseif (actor.owner) then
 					return _unpack (_detalhes.class_colors [actor.owner.classe or "UNKNOW"])
 
-				elseif (actor.arena_team) then
+				elseif (actor.arena_team and _detalhes.color_by_arena_team) then
 					if (actor.arena_team == 0) then
 						return _unpack (_detalhes.class_colors.ARENA_GREEN)
 					else
diff --git a/functions/profiles.lua b/functions/profiles.lua
index ffbdedf2..5235dc7b 100644
--- a/functions/profiles.lua
+++ b/functions/profiles.lua
@@ -904,6 +904,7 @@ local default_profile = {
 		
 	--> PvP
 		only_pvp_frags = false,
+		color_by_arena_team = true,
 
 	--> window settings
 		max_window_size = {width = 480, height = 450},
diff --git a/functions/slash.lua b/functions/slash.lua
index 9b18aa20..74e7d103 100644
--- a/functions/slash.lua
+++ b/functions/slash.lua
@@ -1513,7 +1513,7 @@ Damage Update Status: @INSTANCEDAMAGESTATUS
 		--end
 		
 		print (" ")
-		print (Loc ["STRING_DETAILS1"] .. "(" .. _detalhes.userversion .. ") " ..  Loc ["STRING_COMMAND_LIST"])
+		print (Loc ["STRING_DETAILS1"] .. "" .. _detalhes.userversion .. " [|cFFFFFF00CORE: " .. _detalhes.realversion .. "|r] " ..  Loc ["STRING_COMMAND_LIST"] .. ":")
 		
 		print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_NEW"] .. "|r: " .. Loc ["STRING_SLASH_NEW_DESC"])
 		print ("|cffffaeae/details|r |cffffff33" .. Loc ["STRING_SLASH_SHOW"] .. " " .. Loc ["STRING_SLASH_HIDE"] .. " " .. Loc ["STRING_SLASH_TOGGLE"] .. "|r|cfffcffb0 <" .. Loc ["STRING_WINDOW_NUMBER"] .. ">|r: " .. Loc ["STRING_SLASH_SHOWHIDETOGGLE_DESC"])