A few tweaks

And one bug fixed.