CHG: minor header imporvements