Xerzzul

I saw those issues! That's the reason I figured I would just ship over the changes I made to get it to work. It's hacky and will probably break something...