Cleaned some stuff up.

Code might be buggy as of spells