Slight tweak to stitching. rather pass headers around. other tweaks