corrections from previous commits