reorg + more sample data
aligning set headers to match val alignment