Tweaks and comments.