Straightened out file headers.

Hi Peter,

Various cleanup items will go on this branch.

Tony