half a dozen misc minor improvements

see individual commits for details