Tweaks, fixes and small additions.