Core/Spells: more code updates...