rework and reorganize output data structures; include all available header fields