Added Spells and cleaned code