integrates reassembler and fixes bugs