Configuration file header improvements, refs #341