Header commit

More metadata fixing ups