All spells (but AOE) now handled correctly