Index: game/SpellEffects.cpp
===================================================================
--- game/SpellEffects.cpp	(revision 5445)
+++ game/SpellEffects.cpp	(working copy)
@@ -3411,7 +3411,8 @@
             // Seal of Command - receive benefit from Spell Damage and Healing
             if(m_spellInfo->SpellFamilyFlags & 0x00000002000000LL)
             {
-                bonus = m_caster->SpellDamageBonus(unitTarget, m_spellInfo, bonus, SPELL_DIRECT_DAMAGE);
+                bonus += int32(0.20f*m_caster->SpellBaseDamageBonus((int32)(1<<m_spellInfo->School)));
+                bonus += int32(0.29f*m_caster->SpellBaseDamageBonusForVictim((int32)(1<<m_spellInfo->School), unitTarget));
             }
             break;
         }
Index: game/Unit.cpp
===================================================================
--- game/Unit.cpp	(revision 5445)
+++ game/Unit.cpp	(working copy)
@@ -6649,7 +6649,15 @@
             if(!Channeled) DotFactor = DotDuration / 15000.0f;
             int x = 0;
             for(int j = 0; j < 3; j++)
-                if(spellProto->Effect[j] == 6) x = j;
+            {
+                if(spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA &&
+                    (spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_DAMAGE ||
+                    spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH) )
+                {
+                    x = j;
+                    break;
+                }
+            }
             int DotTicks = 6;
             if(spellProto->EffectAmplitude[x] != 0)
                 DotTicks = DotDuration / spellProto->EffectAmplitude[x];
@@ -6803,15 +6811,8 @@
             break;
         case SPELLFAMILY_PALADIN:
             // Seal of Command - 20% of Done Holy Damage, 29% of Taken Holy Damage
-            if(spellProto->Id==20424)
+            if((spellProto->SpellFamilyFlags & 0x20LL) && spellProto->SpellIconID == 51)
             {
-                CastingTime = 3500; 
-                DoneAdvertisedBenefit  = int32(0.20f*DoneAdvertisedBenefit);
-                TakenAdvertisedBenefit = int32(0.29f*TakenAdvertisedBenefit);
-            }
-            // Consecration - 95% of Holy Damage
-            else if((spellProto->SpellFamilyFlags & 0x20LL) && spellProto->SpellIconID == 51)
-            {
                 DotFactor = 0.95f; 
                 CastingTime = 3500; 
             }
@@ -6834,7 +6835,7 @@
             // Seal of Vengeance - 17% per Fully Stacked Tick - 5 Applications
             else if ((spellProto->SpellFamilyFlags & 0x80000000000LL) && spellProto->SpellIconID == 2040)
             {
-                DotFactor = 0.136;
+                DotFactor = 0.7f;
                 CastingTime = 3500;
             } 
             // Holy shield - 5% of Holy Damage
@@ -6847,6 +6848,25 @@
             {
                 CastingTime = 0; 
             }
+			else
+            {
+                switch (spellProto->Id)
+                {
+                    // Seal of Righteousness - Spell Damage already added
+                    case 25742: // Rank 1
+                    case 25740: // Rank 2
+                    case 25739: // Rank 3
+                    case 25738: // Rank 4
+                    case 25737: // Rank 5
+                    case 25736: // Rank 6
+                    case 25735: // Rank 7
+                    case 25713: // Rank 8
+                    case 27156: // Rank 9
+                        return pdamage;
+                    default:
+                        break;
+                }
+			}
             break;
         case  SPELLFAMILY_SHAMAN:
             // totem attack
@@ -7106,11 +7126,12 @@
     if(spellProto->Id == 15290 || spellProto->Id == 39373 || spellProto->Id == 33778 || spellProto->Id == 379)
         return healamount;
 
+    bool Channeled = IsChanneledSpell(spellProto);
     int32 AdvertisedBenefit = SpellBaseHealingBonus(1<<spellProto->School);
     uint32 CastingTime = GetSpellCastTime(sCastTimesStore.LookupEntry(spellProto->CastingTimeIndex));
     if (CastingTime > 7000) CastingTime = 7000;
     if (CastingTime < 1500) CastingTime = 1500;
-    if (spellProto->Effect[0] == SPELL_EFFECT_APPLY_AURA) CastingTime = 3500;
+    if (spellProto->Effect[0] == SPELL_EFFECT_APPLY_AURA && !Channeled) CastingTime = 3500;
 
     // Healing Taken
     AdvertisedBenefit += SpellBaseHealingBonusForVictim(1<<spellProto->School, pVictim);
@@ -7143,10 +7164,18 @@
         {
             // 200% limit
             if(DotDuration > 30000) DotDuration = 30000;
-            DotFactor = DotDuration / 15000.0f;
+            if(!Channeled) DotFactor = DotDuration / 15000.0f;
             int x = 0;
             for(int j = 0; j < 3; j++)
-                if(spellProto->Effect[j] == 6) x = j;
+            {
+                if(spellProto->Effect[j] == SPELL_EFFECT_APPLY_AURA &&
+                    (spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_HEAL ||
+                    spellProto->EffectApplyAuraName[j] == SPELL_AURA_PERIODIC_LEECH) )
+                {
+                    x = j;
+                    break;
+                }
+            }
             int DotTicks = 6;
             if(spellProto->EffectAmplitude[x] != 0)
                 DotTicks = DotDuration / spellProto->EffectAmplitude[x];
@@ -7173,6 +7202,9 @@
             // Lifebloom final heal
             if (spellProto->SpellFamilyFlags & 0x1000000000LL && damagetype != DOT)
                 CastingTime = 1500;
+            // Tranquilitiy triggered spell
+            else if (spellProto->SpellFamilyFlags & 0x80LL)
+                CastingTime = 500;
             break;
         case SPELLFAMILY_WARRIOR:
         case SPELLFAMILY_HUNTER:
@@ -9583,18 +9615,24 @@
                         break;
                     default: 
                         // -5% per additional effect
-                        CastingTime *= 0.95f;
+                        CastingTime -= 175;
                         break;
                 }
             default: 
                 break;
         }
 
-        AreaEffect = 
-            IsAreaEffectTarget(Targets(spellProto->EffectImplicitTargetA[i])) || 
-            IsAreaEffectTarget(Targets(spellProto->EffectImplicitTargetB[i]));
+        if (!AreaEffect)
+        {
+            AreaEffect =
+                IsAreaEffectTarget(Targets(spellProto->EffectImplicitTargetA[i])) ||
+                IsAreaEffectTarget(Targets(spellProto->EffectImplicitTargetB[i]));
+        }
     }
 
+    if ( CastingTime < 0 )
+        CastingTime = 0;
+
     // Combined Spells with Both Over Time and Direct Damage
     if ( overTime > 0 && CastingTime > 0 && DirectDamage )
     {
@@ -9606,16 +9644,16 @@
         float PtOT = (overTime / 15000.f) / ((overTime / 15000.f) + (OriginalCastTime / 3500.f));
 
         if ( damagetype == DOT )
-            CastingTime *= PtOT;
+            CastingTime  = uint32(CastingTime*PtOT);
         else if ( PtOT < 1.0f )
-            CastingTime *= 1 - PtOT;
+            CastingTime  = uint32(CastingTime*(1-PtOT));
         else 
             CastingTime = 0;
     }
 
     // Area Effect Spells receive only half of bonus
     if ( AreaEffect )
-        CastingTime *= 0.5f;
+        CastingTime = uint32(CastingTime*0.5f);
 
     return CastingTime;
 }