Minor extensions and comments.