New spells and few fixes