Minor tweaks and a few more comments.