kill register_spell make some critbit changes (need to transfer them upstream)
fix finding spells by token make magic_t an enum