Just some quick fixes to address issues brought up.
Unless this patch seriously breaks things, the next fixes will show up in the next major patch. Thanks! (I also included one free bonus event)