Small changes in file header.
Various small improvements in format.