Update & fix file headers