some tweaks, and functionnal recursive style for content slicing / wrapping