improved header stuff