fix(*): fix misc bugs and brokenness

There were lots of little things, I'd have to inspect the diff to make a note
of them all, which I'll do later.