updates after Mark's feedback