corrections from Peter and Jon