odds'n'ends

see commit messages.