Some corrections from Dave