fixed comments from Peter.