One bug fix and a few comments.