Some refactoring, effects and missing spells