corrections from Daniela + defense talk