A lot of spell fixes
More spell fixes!
[Thanks to @Sandshroud:] Fixed conjured spells

	... cleanup