A bunch of small changes/tweaks/comments.