add more header messaging / reformat