Pull request for minor things

Let's see if I can not flood this with too many commits for once.