Minor tweaks

Now I'm satisfied with it. ;)