A few tiny improvements that I had sitting in an edit buffer. More to come.

Much, much more. :-)