After the Collapse: Update 1.0.0.2 (Hot-Patch 1 + 2)

Hi there! Here's the obligatory hot-patch for 1.0. Normally I would have waited until the week-end to have time to make sure I was just fixing bugs, not adding more, but the changes were pretty straightforward. I'm awar…