A part of #22

These are some of the smaller, more innocuous changes proposed and discussed in #22 which in turn is based on #18.

@bastibe: please have a quick look if everything seems OK.

I just want to have those out of the way before tackling the major changes in file formats, modes, and all the other things from #18.