Moved around stuff again and improvements
Spell fix