improve doc and tests + account for Satra's review