Bug fix and comments.