Update to spreadsheet generation

Fixed issues with headers
7 files changed