more tweaks to object wrapper