minor revisions to wrappers