Spell names now work depending on the name given in the annotation.
Cleaned up Spell/SpellManager classes.