generator fixes
move merge to objectwrapper
improve fetchers and fix tests