several fixes (first working version of new fetch)