Bugfixes Gallore (Patreon)

Hey all, sorry for all the bugs in #ANR that I left unfixed for the first week. I pushed the update just before I left for vacation just to allow y'all to enjoy the sweet new cards while I was gone.

Now I'm back and I've pushed an update which should have fixed everything reported until now.