A few bug fixes

There’s still one bug that’s defying fixing right now, though. I’ll get
Kat on it, when she’s not busy. She’s fixing a cabinet right now…