Tweaks & suggestions

No need to merge this, of course, but I thought it would be a convenient way to break down some possible fixes/improvements.

I'll probably tinker a little more.