cleaned-up aspect switching & using spellID instead of spell name