Change header API slightly.  Fix typ-o.