Corrections after Mark's feedback