The Butterfly Collector: Bug Fix Log: The One Where Procrastination Helped

Disclaimer: "Fixed" might be optimistic. It’s entirely possible that in fixing this one, I’ve summoned three new bugs. Let’s all pretend this is fine.