split received patches into separate chunks

plus add a trying patch for remaining issues