Minor tweaks

I'll try to have a look at #7 later unless you beat me to it :)