header: improvements from QA