Many updates

been a while since I actually did these
Initial work on spells