Assorted features

This project was an excellent base for something I'm going to work on soon, but I needed to tweak and extend it in various ways, as well. All of my changes are configurable, and not on by default, so out-of-the-box, it should work the same as before.

If some of these changes (but not all) look interesting, let me know, and I'll create focused feature branches for them.