Tweaks

More and more.