-header improvements