REP-0127: clarifications and corrections preparing for acceptance review