fixed spells/cleanup