@alice_watson

Me:

- did a bunch of stuff, can't remember what; I'm about to mess things up again, though, so wanted to save the least-broken version for posterity
- improvements to diagnostic output formatting