further wrapper improvements