Tweaks and small additions.