Revert "Hopefully fixed obscure bugs with saving, and spells not working right."

This reverts commit 935ad5312aa7e75c4a2eb7af3c11218f3b8028e4.
Revert "Revert "Hopefully fixed obscure bugs with saving, and spells not working right.""

This reverts commit 5cebab9612594b7eb897531c4dfcff13439dabda.
Revert "Hopefully fixed obscure bugs with saving, and spells not working right."

This reverts commit 935ad5312aa7e75c4a2eb7af3c11218f3b8028e4.
Undoing bugs, hopefuly.
Revert "Revert "Hopefully fixed obscure bugs with saving, and spells not working right.""

This reverts commit 4e691ffd5058eb5e3cc07e743b7a216e1f06570e.