moved spell effects out of spell object
added more defines for spells
removed some comments