Reimplement push shape data to buffer Flush data after encoding it rather than on frame start, header cleanup