header fixes, questions