Further improvements on AOE spells