more tpl changes, mostly header work.